[cig-commits] [commit] master: Made steinberger material model aware of $ASPECT_SOURCE_DIR. (0a6615c)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/a7135c1f7697d39efff2f47a79ca1e1395cff504...73a71ba37f203bfed63bb8b602fdbd30ab99b1af

>---------------------------------------------------------------

commit 0a6615c1c8e6104d946847a095900047fa858b20
Author: Rene Gassmoeller <R.Gassmoeller at mailbox.org>
Date:   Wed May 21 11:29:39 2014 -0500

    Made steinberger material model aware of $ASPECT_SOURCE_DIR.


>---------------------------------------------------------------

0a6615c1c8e6104d946847a095900047fa858b20
 source/material_model/steinberger.cc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/source/material_model/steinberger.cc b/source/material_model/steinberger.cc
index 9f6a4fd..7b8cb48 100644
--- a/source/material_model/steinberger.cc
+++ b/source/material_model/steinberger.cc
@@ -879,7 +879,7 @@ namespace aspect
       {
         prm.enter_subsection("Steinberger model");
         {
-          prm.declare_entry ("Data directory", "data/material-model/steinberger/",
+          prm.declare_entry ("Data directory", "$ASPECT_SOURCE_DIR/data/material-model/steinberger/",
                              Patterns::DirectoryName (),
                              "The path to the model data. ");
           prm.declare_entry ("Material file names", "pyr-ringwood88.txt",
@@ -924,6 +924,14 @@ namespace aspect
         prm.enter_subsection("Steinberger model");
         {
           datadirectory        = prm.get ("Data directory");
+          {
+            const std::string      subst_text = "$ASPECT_SOURCE_DIR";
+            std::string::size_type position;
+            while (position = datadirectory.find (subst_text),  position!=std::string::npos)
+              datadirectory.replace (datadirectory.begin()+position,
+                                      datadirectory.begin()+position+subst_text.size(),
+                                      ASPECT_SOURCE_DIR);
+          }
           material_file_names  = Utilities::split_string_list
                                  (prm.get ("Material file names"));
           radial_viscosity_file_name   = prm.get ("Radial viscosity file name");