Merge pull request #647 from bobmyhill/improve_coverage_2

Improve coverage

Author: bobmyhill

Readme.md

@@ -1,6 +1,6 @@
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.14238360.svg)](https://doi.org/10.5281/zenodo.14238360)
 [![DOI](https://joss.theoj.org/papers/10.21105/joss.05389/status.svg)](https://doi.org/10.21105/joss.05389)
-[![coverage](https://img.shields.io/badge/coverage-%3E91%25-green")](https://github.com/geodynamics/burnman/actions/workflows/coverage.yml)
+[![coverage](https://img.shields.io/badge/coverage-%3E92%25-green")](https://github.com/geodynamics/burnman/actions/workflows/coverage.yml)
 
 # BurnMan - a Python toolkit for planetary geophysics, geochemistry and thermodynamics
 

tests/test_layer.py

@@ -85,6 +85,34 @@ def test_evaluate(self):
         self.assertArraysAlmostEqual(d[0], d0)
         self.assertArraysAlmostEqual(d[1], d1)
 
+    def test_properties(self):
+        m = self.layer1()
+
+        self.assertTrue(isinstance(m.mass, np.floating))
+        self.assertTrue(isinstance(m.moment_of_inertia, np.floating))
+        self.assertTrue(isinstance(m.gravity, np.ndarray))
+        self.assertTrue(isinstance(m.bullen, np.ndarray))
+        self.assertTrue(isinstance(m.brunt_vasala, np.ndarray))
+        self.assertTrue(isinstance(m.P, np.ndarray))
+        self.assertTrue(isinstance(m.T, np.ndarray))
+        self.assertTrue(isinstance(m.energy, np.ndarray))
+        self.assertTrue(isinstance(m.gibbs, np.ndarray))
+        self.assertTrue(isinstance(m.helmholtz, np.ndarray))
+        self.assertTrue(isinstance(m.H, np.ndarray))
+        self.assertTrue(isinstance(m.V, np.ndarray))
+        self.assertTrue(isinstance(m.molar_mass, np.ndarray))
+        self.assertTrue(isinstance(m.rho, np.ndarray))
+        self.assertTrue(isinstance(m.K_T, np.ndarray))
+        self.assertTrue(isinstance(m.K_S, np.ndarray))
+        self.assertTrue(isinstance(m.beta_T, np.ndarray))
+        self.assertTrue(isinstance(m.beta_S, np.ndarray))
+        self.assertTrue(isinstance(m.G, np.ndarray))
+        self.assertTrue(isinstance(m.v_phi, np.ndarray))
+        self.assertTrue(isinstance(m.gr, np.ndarray))
+        self.assertTrue(isinstance(m.alpha, np.ndarray))
+        self.assertTrue(isinstance(m.C_p, np.ndarray))
+        self.assertTrue(isinstance(m.C_v, np.ndarray))
+
     def test_tbl(self):
         p = BoundaryLayerPerturbation(
             radius_bottom=3480.0e3,

tests/test_solidsolution.py

@@ -1261,6 +1261,28 @@ def test_evaluate(self):
 
         self.assertArraysAlmostEqual(G1, G2)
 
+    def test_evaluate_with_volumes(self):
+        ol = olivine_ideal_ss()
+        molar_fractions = np.array([[0.1, 0.9], [0.2, 0.8]])
+        pressures = [1.0e9, 2.0e9]
+        temperatures = [300.0, 600.0]
+
+        volumes = ol.evaluate(["V"], pressures, temperatures, molar_fractions)[0]
+        P1, G1 = ol.evaluate_with_volumes(
+            ["pressure", "gibbs"], volumes, temperatures, molar_fractions
+        )
+        P2 = []
+        G2 = []
+        for i in range(2):
+            ol.set_composition(molar_fractions[i])
+            ol.set_state_with_volume(volumes[i], temperatures[i])
+            P2.append(ol.pressure)
+            G2.append(ol.gibbs)
+
+        self.assertArraysAlmostEqual(pressures, P1)
+        self.assertArraysAlmostEqual(P1, P2)
+        self.assertArraysAlmostEqual(G1, G2)
+
     def test_relaxed_solution(self):
         opx = burnman.minerals.JH_2015.orthopyroxene()
         ropx = burnman.RelaxedSolution(opx, opx.reaction_basis, opx.compositional_basis)