[cig-commits] [commit] master: Augment warnings (867a349)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/916ee6acd98bd253c534a4b858b8d86ec62c3fd5...5e9eb1c42d6dd00a30a59872a2b31d1c0f8bd09c

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

commit 867a349e28e7399ebcfaa3a29a41e5d88d5b58bd
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Fri Dec 12 16:24:04 2014 -0800

    Augment warnings


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

867a349e28e7399ebcfaa3a29a41e5d88d5b58bd
 burnman/eos/birch_murnaghan.py      | 10 +++++-----
 burnman/eos/mie_grueneisen_debye.py | 20 ++++++++++----------
 burnman/eos/slb.py                  | 22 +++++++++++-----------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/burnman/eos/birch_murnaghan.py b/burnman/eos/birch_murnaghan.py
index 76e7271..0718162 100644
--- a/burnman/eos/birch_murnaghan.py
+++ b/burnman/eos/birch_murnaghan.py
@@ -157,15 +157,15 @@ class BirchMurnaghanBase(eos.EquationOfState):
         #made up these values from experience, and we are only 
         #raising a warning.  Better way to do this? [IR]
         if params['V_0'] < 1.e-7 or params['V_0'] > 1.e-3:
-            warnings.warn( 'Unusual value for V_0' )
+            warnings.warn( 'Unusual value for V_0', stacklevel=2 )
         if params['K_0'] < 1.e9 or params['K_0'] > 1.e13:
-            warnings.warn( 'Unusual value for K_0' )
+            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' )
+            warnings.warn( 'Unusual value for Kprime_0', stacklevel=2 )
         if params['G_0'] < 0.0 or params['G_0'] > 1.e13:
-            warnings.warn( 'Unusual value for G_0' )
+            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' )
+            warnings.warn( 'Unusual value for Gprime_0', stacklevel=2 )
 
 
 
diff --git a/burnman/eos/mie_grueneisen_debye.py b/burnman/eos/mie_grueneisen_debye.py
index 80f85a2..d5840ae 100644
--- a/burnman/eos/mie_grueneisen_debye.py
+++ b/burnman/eos/mie_grueneisen_debye.py
@@ -191,25 +191,25 @@ class MGDBase(eos.EquationOfState):
         #made up these values from experience, and we are only 
         #raising a warning.  Better way to do this? [IR]
         if params['V_0'] < 1.e-7 or params['V_0'] > 1.e-3:
-            warnings.warn( 'Unusual value for V_0' )
+            warnings.warn( 'Unusual value for V_0' , stacklevel=2 )
         if params['K_0'] < 1.e9 or params['K_0'] > 1.e13:
-            warnings.warn( 'Unusual value for K_0' )
+            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' )
+            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' )
+            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' )
+            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' )
+            warnings.warn( 'Unusual value for molar_mass' , stacklevel=2)
         if params['n'] < 1. or params['n'] > 100. or not float(params['n']).is_integer():
-            warnings.warn( 'Unusual value for n' )
+            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' )
+            warnings.warn( 'Unusual value for Debye_0' , stacklevel=2)
         if params['grueneisen_0'] < 0. or params['grueneisen_0'] > 10.:
-            warnings.warn( 'Unusual value for grueneisen_0' )
+            warnings.warn( 'Unusual value for grueneisen_0' , stacklevel=2)
         if params['q_0'] < -10. or params['q_0'] > 10.:
-            warnings.warn( 'Unusual value for q_0' )
+            warnings.warn( 'Unusual value for q_0' , stacklevel=2)
 
 
 class MGD3(MGDBase):
diff --git a/burnman/eos/slb.py b/burnman/eos/slb.py
index 4a3230d..1d06a95 100644
--- a/burnman/eos/slb.py
+++ b/burnman/eos/slb.py
@@ -278,27 +278,27 @@ class SLBBase(eos.EquationOfState):
         #made up these values from experience, and we are only 
         #raising a warning.  Better way to do this? [IR]
         if params['V_0'] < 1.e-7 or params['V_0'] > 1.e-3:
-            warnings.warn( 'Unusual value for V_0' )
+            warnings.warn( 'Unusual value for V_0', stacklevel=2 )
         if params['K_0'] < 1.e9 or params['K_0'] > 1.e13:
-            warnings.warn( 'Unusual value for K_0' )
+            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' )
+            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' )
+            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' )
+            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' )
+            warnings.warn( 'Unusual value for molar_mass', stacklevel=2 )
         if params['n'] < 1. or params['n'] > 100. or not float(params['n']).is_integer():
-            warnings.warn( 'Unusual value for n' )
+            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' )
+            warnings.warn( 'Unusual value for Debye_0', stacklevel=2 )
         if params['grueneisen_0'] < 0. or params['grueneisen_0'] > 10.:
-            warnings.warn( 'Unusual value for grueneisen_0' )
+            warnings.warn( 'Unusual value for grueneisen_0' , stacklevel=2)
         if params['q_0'] < -10. or params['q_0'] > 10.:
-            warnings.warn( 'Unusual value for q_0' )
+            warnings.warn( 'Unusual value for q_0' , stacklevel=2)
         if params['eta_s_0'] < -10. or params['eta_s_0'] > 10.:
-            warnings.warn( 'Unusual value for eta_s_0' )
+            warnings.warn( 'Unusual value for eta_s_0' , stacklevel=2)