[cig-commits] [commit] master: Made reference viscosity a user input parameter for steinberger material model. (5bb5bc1)

[cig_noreply at geodynamics.org]

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

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

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

commit 5bb5bc1535173bd16b5c176b4a4320c52793c53e
Author: Rene Gassmoeller <R.Gassmoeller at mailbox.org>
Date:   Tue May 20 09:08:42 2014 -0500

    Made reference viscosity a user input parameter for steinberger material model.


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

5bb5bc1535173bd16b5c176b4a4320c52793c53e
 include/aspect/material_model/steinberger.h | 1 +
 source/material_model/steinberger.cc        | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/aspect/material_model/steinberger.h b/include/aspect/material_model/steinberger.h
index 05594f8..098e2f4 100644
--- a/include/aspect/material_model/steinberger.h
+++ b/include/aspect/material_model/steinberger.h
@@ -217,6 +217,7 @@ namespace aspect
         bool interpolation;
         bool latent_heat;
         bool compressible;
+        double reference_eta;
         std::vector<double> avg_temp;
         std::string datadirectory;
         std::vector<std::string> material_file_names;
diff --git a/source/material_model/steinberger.cc b/source/material_model/steinberger.cc
index 7b8cb48..7c51883 100644
--- a/source/material_model/steinberger.cc
+++ b/source/material_model/steinberger.cc
@@ -523,7 +523,7 @@ namespace aspect
     Steinberger<dim>::
     reference_viscosity () const
     {
-      const double reference_eta    = 1e23;
+      //const double reference_eta    = 1e23;
       return reference_eta;
     }
 
@@ -907,6 +907,10 @@ namespace aspect
                              Patterns::Bool (),
                              "whether to include a compressible material description."
                              "For a description see the manual section.");
+          prm.declare_entry ("Reference viscosity", "1e21",
+                             Patterns::Double(0),
+                             "whether to include a compressible material description."
+                             "For a description see the manual section.");
           prm.leave_subsection();
         }
         prm.leave_subsection();
@@ -939,6 +943,7 @@ namespace aspect
           interpolation        = prm.get_bool ("Bilinear interpolation");
           latent_heat          = prm.get_bool ("Latent heat");
           compressible          = prm.get_bool ("Compressible");
+          reference_eta          = prm.get_double ("Reference viscosity");
 
 
           prm.leave_subsection();