[cig-commits] [commit] inversion, master, validate_MT_params: Added Negative Pressure warning (edde94e)

[cig_noreply at geodynamics.org]

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

On branches: inversion,master,validate_MT_params
Link       : https://github.com/geodynamics/burnman/compare/80c2a295c42dfdb38f83f6c1334bf7d8f97a8463...409647ff05dfad6a686198cac1481bd46b5e2e62

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

commit edde94ed48848ead49a77133401e28fa0da759ab
Author: I <kmanunterborn at gmail.com>
Date:   Fri Dec 12 15:49:25 2014 -0800

    Added Negative Pressure warning
    
    Negative pressure warning, cleanup


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

edde94ed48848ead49a77133401e28fa0da759ab
 burnman/seismic.py     |  2 +-
 tests/test_geotherm.py | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/burnman/seismic.py b/burnman/seismic.py
index 97e03ac..4eacdbe 100644
--- a/burnman/seismic.py
+++ b/burnman/seismic.py
@@ -228,7 +228,7 @@ class SeismicRadiusTable(Seismic1DModel):
         return self._lookup(depth, self.table_density)
 
     def depth(self, pressure):
-        if pressure > max(self.table_pressure):
+        if pressure > max(self.table_pressure) or pressure < min(self.table_pressure)  :
            raise ValueError, "Pressure outside range of PREM"
            radius = np.interp(pressure, self.table_pressure[::-1], self.table_radius[::-1] )
         return self.earth_radius - radius
diff --git a/tests/test_geotherm.py b/tests/test_geotherm.py
index e96ec7e..94598c2 100644
--- a/tests/test_geotherm.py
+++ b/tests/test_geotherm.py
@@ -29,18 +29,17 @@ class mypericlase(burnman.Mineral):
             'grueneisen_0': 1.5,
             'q_0': 1.5,
             'eta_s_0': 2.8}
+        burnman.Mineral.__init__(self)
 
 
 class geotherm(BurnManTest):
     def test_adiabat(self):
         rock = mypericlase()
-        rock.params['K_0'] = 0.
-        pressure = [10e9]
-        T0 = 300.
-        test_K_adiabat = burnman.geotherm.adiabatic(pressure,T0,rock.params)
-        self.assertFloatEqual(test_K_adiabat,T0)
-
-
+        pressure = [100.e9,150.e9]
+        rock.set_method('slb3')
+        T0 = 1500.
+        test_K_adiabat = burnman.geotherm.adiabatic(pressure,T0,rock)
+        self.assertArraysAlmostEqual(test_K_adiabat,[1500,1650.22034002])
 
 
 if __name__ == '__main__':