[cig-commits] [commit] master: rename Morency and Doin model and section (312d63b)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/59e1a2f9609f8666d604a8513b66c1d5f7b326b8...16c51416ab671466458d3c80fd33e77cd7c2e364

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

commit 312d63baeccf1d40c8849bf841849564a1c59856
Author: Timo Heister <timo.heister at gmail.com>
Date:   Thu Jan 22 12:16:22 2015 -0500

    rename Morency and Doin model and section


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

312d63baeccf1d40c8849bf841849564a1c59856
 source/material_model/morency_doin.cc | 8 ++++----
 tests/morency_doin.prm                | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/material_model/morency_doin.cc b/source/material_model/morency_doin.cc
index b1d5cc1..e47e465 100644
--- a/source/material_model/morency_doin.cc
+++ b/source/material_model/morency_doin.cc
@@ -224,7 +224,7 @@ namespace aspect
     {
       prm.enter_subsection("Material model");
       {
-        prm.enter_subsection ("Morency");
+        prm.enter_subsection ("Morency and Doin");
         {
           prm.declare_entry ("Densities", "3300.",
                              Patterns::List(Patterns::Double(0)),
@@ -282,7 +282,7 @@ namespace aspect
 
       prm.enter_subsection("Material model");
       {
-        prm.enter_subsection ("Morency");
+        prm.enter_subsection ("Morency and Doin");
         {
           gamma = prm.get_double("Coefficient of yield stress increase with depth");
           thermal_diffusivity = prm.get_double("Thermal diffusivity");
@@ -350,7 +350,7 @@ namespace aspect
     }
 
     ASPECT_REGISTER_MATERIAL_MODEL(MorencyDoin,
-                                   "morency doin",
+                                   "Morency and Doin",
                                    "An implementation of the visco-plastic rheology described by (Morency"
                                    " and Doin, 2004). Compositional fields can each be assigned individual"
                                    " activation energies, reference densities, thermal expansivities,"
@@ -375,6 +375,6 @@ namespace aspect
                                    "\n\n"
                                    " The value for the components of this formula and additional"
                                    " parameters are read from the parameter file in subsection"
-                                   " 'Material model/Morency'.")
+                                   " 'Material model/Morency and Doin'.")
   }
 }
diff --git a/tests/morency_doin.prm b/tests/morency_doin.prm
index 7624894..417179e 100644
--- a/tests/morency_doin.prm
+++ b/tests/morency_doin.prm
@@ -44,9 +44,9 @@ subsection Initial conditions
 end
 
 subsection Material model
-  set Model name = morency doin
+  set Model name = Morency and Doin
 
-  subsection Morency
+  subsection Morency and Doin
     set Densities = 3300,2700,2700
     set Activation energies = 500,320,320
     set Coefficient of yield stress increase with depth = 0.25