[cig-commits] [commit] master: change the default values of the melt fraction postprocessor to match the values in the papers (3f24b76)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/5dd9f8e83db40d26a5659c449816fc72358f3746...426fbfcad3568313f61490f77127c5e1c97a005d

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

commit 3f24b761826da9c273d5a40e20c2b30f372787a8
Author: Juliane Dannberg <dannberg at gfz-potsdam.de>
Date:   Mon May 19 21:24:47 2014 +0200

    change the default values of the melt fraction postprocessor to match the values in the papers


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

3f24b761826da9c273d5a40e20c2b30f372787a8
 source/postprocess/visualization/melt_fraction.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/postprocess/visualization/melt_fraction.cc b/source/postprocess/visualization/melt_fraction.cc
index f0b33e7..2aacbb2 100644
--- a/source/postprocess/visualization/melt_fraction.cc
+++ b/source/postprocess/visualization/melt_fraction.cc
@@ -93,7 +93,7 @@ namespace aspect
             if (peridotite_melt_fraction > F_max && temperature < T_liquidus)
               {
                 const double T_max = std::pow(F_max,1/beta) * (T_lherz_liquidus - T_solidus) + T_solidus;
-                peridotite_melt_fraction = F_max + (1 - F_max) * (temperature - T_max) / (T_liquidus - T_max);
+                peridotite_melt_fraction = F_max + (1 - F_max) * pow((temperature - T_max) / (T_liquidus - T_max),beta);
               }
 
             // melting of pyroxenite after Sobolev et al., 2011
@@ -193,7 +193,7 @@ namespace aspect
                                  "in the quadratic function that approximates "
                                  "the liquidus of peridotite. "
                                  "Units: $°C/(Pa^2)$.");
-              prm.declare_entry ("r1", "0.4",
+			  prm.declare_entry ("r1", "0.5",
                                  Patterns::Double (),
                                  "Constant in the linear function that "
                                  "approximates the clinopyroxene reaction "
@@ -210,7 +210,7 @@ namespace aspect
                                  "Exponent of the melting temperature in "
                                  "the melt fraction calculation. "
                                  "Units: non-dimensional.");
-              prm.declare_entry ("Mass fraction cpx", "0.3",
+			  prm.declare_entry ("Mass fraction cpx", "0.15",
                                  Patterns::Double (),
                                  "Mass fraction of clinopyroxene in the "
                                  "peridotite to be molten. "
@@ -233,7 +233,7 @@ namespace aspect
                                  "in the quadratic function that approximates "
                                  "the solidus of pyroxenite. "
                                  "Units: $°C/(Pa^2)$.");
-              prm.declare_entry ("E1", "633.8",
+			  prm.declare_entry ("E1", "663.8",
                                  Patterns::Double (),
                                  "Prefactor of the linear depletion term "
                                  "in the quadratic function that approximates "
@@ -301,7 +301,7 @@ namespace aspect
     namespace VisualizationPostprocessors
     {
       ASPECT_REGISTER_VISUALIZATION_POSTPROCESSOR(MeltFraction,
-                                                  "melt fraction",
+                                                  "melt fraction", // TODO write down equations here
                                                   "A visualization output object that generates output "
                                                   "for the melt fraction at the temperature and "
                                                   "pressure of the current point (batch melting). "