[cig-commits] [commit] master: Should not validate G, G' for cases when it is nan (dcd0f36)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/3f851f06618bcb112ae159cb61326e211911be2e...1f0b803e9189e4c6cc1ff3065bbc5da699dc80b6

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

commit dcd0f36d7840dc37112213d7dfaff187a00db6fb
Author: Ian Rose <ian.r.rose at gmail.com>
Date:   Sun Dec 14 20:37:29 2014 -0800

    Should not validate G, G' for cases when it is nan


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

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

diff --git a/burnman/eos/mie_grueneisen_debye.py b/burnman/eos/mie_grueneisen_debye.py
index d5840ae..be52fce 100644
--- a/burnman/eos/mie_grueneisen_debye.py
+++ b/burnman/eos/mie_grueneisen_debye.py
@@ -196,10 +196,10 @@ class MGDBase(eos.EquationOfState):
             warnings.warn( 'Unusual value for K_0', stacklevel=2 )
         if params['Kprime_0'] < -5. or params['Kprime_0'] > 10.:
             warnings.warn( 'Unusual value for Kprime_0', stacklevel=2 )
-        if params['G_0'] < 0. or params['G_0'] > 1.e13:
-            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['G_0'] is not float('nan') and (params['G_0'] < 0. or params['G_0'] > 1.e13):
+            warnings.warn( 'Unusual value for G_0', stacklevel=2 )
+        if params['Gprime_0'] is not float('nan') and (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.:
             warnings.warn( 'Unusual value for molar_mass' , stacklevel=2)
         if params['n'] < 1. or params['n'] > 100. or not float(params['n']).is_integer():
diff --git a/burnman/eos/slb.py b/burnman/eos/slb.py
index 5186121..c0c1012 100644
--- a/burnman/eos/slb.py
+++ b/burnman/eos/slb.py
@@ -283,9 +283,9 @@ class SLBBase(eos.EquationOfState):
             warnings.warn( 'Unusual value for K_0', stacklevel=2 )
         if params['Kprime_0'] < -5. or params['Kprime_0'] > 10.:
             warnings.warn( 'Unusual value for Kprime_0', stacklevel=2 )
-        if params['G_0'] < 0. or params['G_0'] > 1.e13:
+        if params['G_0'] is not float('nan') and (params['G_0'] < 0. or params['G_0'] > 1.e13):
             warnings.warn( 'Unusual value for G_0', stacklevel=2 )
-        if params['Gprime_0'] < -5. or params['Gprime_0'] > 10.:
+        if params['Gprime_0'] is not float('nan') and (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'] > 10.:
             warnings.warn( 'Unusual value for molar_mass', stacklevel=2 )