[cig-commits] [commit] master: Changed validate param bounds to allow large minerals (like atg) (c240b94)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/fb1efda477c84dda519a26fcd6480eef1f23c1cf...a2a7ea5dbd2bbbb7bb8c207b3e569e3967a4c47b

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

commit c240b94c4e5609311fabd05df50aca48eb30a5b4
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Sat Dec 13 15:00:27 2014 -0800

    Changed validate param bounds to allow large minerals (like atg)


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

c240b94c4e5609311fabd05df50aca48eb30a5b4
 burnman/eos/modified_tait.py | 10 ++++++----
 burnman/eos/slb.py           |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/burnman/eos/modified_tait.py b/burnman/eos/modified_tait.py
index 5598336..b86687f 100644
--- a/burnman/eos/modified_tait.py
+++ b/burnman/eos/modified_tait.py
@@ -8,6 +8,7 @@ import equation_of_state as eos
 import einstein
 from burnman.endmemberdisorder import *
 import burnman.constants as constants
+import warnings
 
 T_0=298.15 # Standard temperature = 25 C
 P_0=1.e5 # Standard pressure = 1.e5 Pa
@@ -323,7 +324,7 @@ class MT(eos.EquationOfState):
         # no test for H_0
         if params['S_0'] is not float('nan') and params['S_0'] < 0.:
             warnings.warn( 'Unusual value for S_0', stacklevel=2 )
-        if params['V_0'] < 1.e-7 or params['V_0'] > 1.e-3:
+        if params['V_0'] < 1.e-7 or params['V_0'] > 1.e-2:
             warnings.warn( 'Unusual value for V_0', stacklevel=2 )
 
             
@@ -340,8 +341,9 @@ class MT(eos.EquationOfState):
             warnings.warn( 'Unusual value for Kprime_0', stacklevel=2 )
         # no test for Kdprime_0
 
-        if params['n'] < 1. or params['n'] > 100. or not float(params['n']).is_integer():
+        if params['n'] < 1. or params['n'] > 1000.:
             warnings.warn( 'Unusual value for n', stacklevel=2 )
-        if params['molar_mass'] < 0.001 or params['molar_mass'] > 1.:
+            print params['name'], params['n']
+        if params['molar_mass'] < 0.001 or params['molar_mass'] > 10.:
             warnings.warn( 'Unusual value for molar_mass', stacklevel=2 )
-
+            print params['name'], params['molar_mass']
diff --git a/burnman/eos/slb.py b/burnman/eos/slb.py
index 4687c85..5186121 100644
--- a/burnman/eos/slb.py
+++ b/burnman/eos/slb.py
@@ -287,9 +287,9 @@ class SLBBase(eos.EquationOfState):
             warnings.warn( 'Unusual value for G_0', stacklevel=2 )
         if params['Gprime_0'] < -5. or params['Gprime_0'] > 10.:
             warnings.warn( 'Unusual value for Gprime_0', stacklevel=2 )
-        if params['molar_mass'] < 0.001 or params['molar_mass'] > 1.:
+        if params['molar_mass'] < 0.001 or params['molar_mass'] > 10.:
             warnings.warn( 'Unusual value for molar_mass', stacklevel=2 )
-        if params['n'] < 1. or params['n'] > 100. or not float(params['n']).is_integer():
+        if params['n'] < 1. or params['n'] > 1000.:
             warnings.warn( 'Unusual value for n', stacklevel=2 )
         if params['Debye_0'] < 1. or params['Debye_0'] > 10000.:
             warnings.warn( 'Unusual value for Debye_0', stacklevel=2 )