Merge pull request #656 from bobmyhill/remove_unused_testcode

removed unused test code

Author: bobmyhill

tests/test_elasticsolution.py

@@ -152,23 +152,6 @@ def __init__(self, molar_fractions=None):
         burnman.ElasticSolution.__init__(self, molar_fractions)
 
 
-class two_site_ss_asymmetric(burnman.ElasticSolution):
-    # Three-endmember, two site asymmetric solid solution
-    def __init__(self, molar_fractions=None):
-        self.name = "two_site_ss (asymmetric)"
-        self.solution_model = ElasticAsymmetricRegularSolution(
-            endmembers=[
-                [pyrope(), "[Mg]3[Al]2Si3O12"],
-                [pyrope(), "[Fe]3[Al]2Si3O12"],
-                [pyrope(), "[Mg]3[Mg1/2Si1/2]2Si3O12"],
-            ],
-            alphas=[1.0, 2.0, 2.0],
-            energy_interaction=[[10.0e3, 5.0e3], [-10.0e3]],
-        )
-
-        burnman.ElasticSolution.__init__(self, molar_fractions)
-
-
 class two_site_ss_subregular(burnman.ElasticSolution):
     # Three-endmember, two site solid solution
     def __init__(self, molar_fractions=None):
@@ -188,25 +171,6 @@ def __init__(self, molar_fractions=None):
         burnman.ElasticSolution.__init__(self, molar_fractions)
 
 
-class two_site_ss_subregular_asymmetric(burnman.ElasticSolution):
-    # Three-endmember, two site solid solution
-    def __init__(self, molar_fractions=None):
-        self.name = "two_site_ss (subregular symmetric)"
-        self.solution_model = ElasticSubregularSolution(
-            endmembers=[
-                [pyrope(), "[Mg]3[Al]2Si3O12"],
-                [pyrope(), "[Fe]3[Al]2Si3O12"],
-                [pyrope(), "[Mg]3[Mg1/2Si1/2]2Si3O12"],
-            ],
-            energy_interaction=[
-                [[10.0e3, -10.0e3], [5.0e3, 3.0e3]],
-                [[-10.0e3, -10.0e3]],
-            ],
-        )
-
-        burnman.ElasticSolution.__init__(self, molar_fractions)
-
-
 class two_site_ss_subregular_ternary(burnman.ElasticSolution):
     # Three-endmember, two site solid solution with ternary term
     def __init__(self, molar_fractions=None):

tests/test_fitting.py

@@ -228,11 +228,8 @@ def test_PTV_data_eos_numerical_failure(self):
         PTV = np.array([pressures, temperatures, volumes]).T
         params = ["V_0", "K_0", "Kprime_0"]
 
-        try:
+        with self.assertRaises(Exception):
             _ = burnman.eos_fitting.fit_PTV_data(fo, params, PTV, verbose=False)
-            self.assertTrue(False)
-        except Exception:
-            self.assertTrue(True)
 
     def test_PTV_data_eos_exception(self):
         fo = burnman.minerals.SLB_2011.forsterite()
@@ -248,11 +245,8 @@ def test_PTV_data_eos_exception(self):
         PTV = np.array([pressures, temperatures, volumes]).T
         params = ["V_0", "K_0", "Kprime_0"]
 
-        try:
+        with self.assertRaises(Exception):
             _ = burnman.eos_fitting.fit_PTV_data(fo, params, PTV, verbose=False)
-            self.assertTrue(False)
-        except Exception:
-            self.assertTrue(True)
 
     def test_bounded_solution_fitting(self):
         solution = burnman.minerals.SLB_2011.mg_fe_olivine()