[cig-commits] [commit] master: Small bugfixes in lookup class of steinberger material model. (1b14fa8)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed May 21 14:02:51 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/a7135c1f7697d39efff2f47a79ca1e1395cff504...73a71ba37f203bfed63bb8b602fdbd30ab99b1af
>---------------------------------------------------------------
commit 1b14fa8ab89d3ddec1f47a4ce506555560531c78
Author: Rene Gassmoeller <R.Gassmoeller at mailbox.org>
Date: Mon May 19 16:01:19 2014 -0500
Small bugfixes in lookup class of steinberger material model.
>---------------------------------------------------------------
1b14fa8ab89d3ddec1f47a4ce506555560531c78
source/material_model/steinberger.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/material_model/steinberger.cc b/source/material_model/steinberger.cc
index 862e484..2bdb507 100644
--- a/source/material_model/steinberger.cc
+++ b/source/material_model/steinberger.cc
@@ -265,7 +265,7 @@ namespace aspect
double get_nT(double temperature) const
{
- temperature=std::max(min_temp+delta_temp, temperature);
+ temperature=std::max(min_temp, temperature);
temperature=std::min(temperature, max_temp-delta_temp);
Assert(temperature>=min_temp, ExcMessage("not in range"));
Assert(temperature<=max_temp, ExcMessage("not in range"));
@@ -274,7 +274,7 @@ namespace aspect
double get_np(double pressure) const
{
- pressure=std::max(min_press+delta_press, pressure);
+ pressure=std::max(min_press, pressure);
pressure=std::min(pressure, max_press-delta_press);
Assert(pressure>=min_press, ExcMessage("not in range"));
Assert(pressure<=max_press, ExcMessage("not in range"));
More information about the CIG-COMMITS
mailing list