@@ -30,7 +30,7 @@ def test_calibrant_initialisation(self):
3030 pressures .append (calibrant .pressure (V , 1000.0 ))
3131
3232 pressures = np .array (pressures )
33- self . assertArraysAlmostEqual (pressures , 10.0e9 + pressures * 0.0 )
33+ np . testing . assert_allclose (pressures , 10.0e9 + pressures * 0.0 , rtol = 1e-5 )
3434
3535 def test_pressure_to_pressure (self ):
3636 gold1 = calibrants .Anderson_1989 .Au ()
@@ -41,7 +41,24 @@ def test_pressure_to_pressure(self):
4141 pressure2 = pressure_to_pressure (gold1 , gold2 , pressure1 , temperature )
4242 pressure1new = pressure_to_pressure (gold2 , gold1 , pressure2 , temperature )
4343
44- self .assertAlmostEqual (pressure1 / 1.0e9 , pressure1new / 1.0e9 , 4 )
44+ np .testing .assert_allclose (pressure1 / 1.0e9 , pressure1new / 1.0e9 , rtol = 1e-5 )
45+
46+ def test_pressure_to_pressure_cov (self ):
47+ gold1 = calibrants .Anderson_1989 .Au ()
48+ gold2 = calibrants .Fei_2007 .Au ()
49+
50+ temperature = 1000.0
51+ pressure1 = 20.0e9
52+ PTcov1 = np .array ([[1.0e18 , 1.0e8 ], [1.0e8 , 10.0 ]])
53+ pressure2 , PTcov2 = pressure_to_pressure (
54+ gold1 , gold2 , pressure1 , temperature , PTcov1
55+ )
56+ pressure1new , PTcov1new = pressure_to_pressure (
57+ gold2 , gold1 , pressure2 , temperature , PTcov2
58+ )
59+
60+ np .testing .assert_allclose (PTcov1 , PTcov1new , rtol = 1e-5 )
61+ np .testing .assert_allclose (pressure1 / 1.0e9 , pressure1new / 1.0e9 , rtol = 1e-5 )
4562
4663
4764if __name__ == "__main__" :
0 commit comments