update CHRU2014 scripts

Author: bobmyhill

contrib/CHRU2014/helper_solid_solution.py

@@ -17,7 +17,8 @@ class HelperSolidSolution(burnman.Mineral):
     solution between two or more end member minerals.  It is not
     completely clear how to do this, or how valid this approximation
     is, but here we just do a weighted arithmetic average of the
-    thermoelastic properties of the end members according to their molar fractions
+    thermoelastic properties of the end members according to their molar
+    fractions.
     """
 
     def __init__(self, endmembers, molar_fractions):
@@ -127,7 +128,7 @@ def __init__(self, fe_num):
 
 class other_ferropericlase(HelperSolidSolution):
     def __init__(self, fe_num):
-        endmembers = [minerals.other.periclase(), minerals.other.wuestite()]
+        endmembers = [minerals.SLB_2011.periclase(), minerals.SLB_2011.wuestite()]
         molar_fractions = [1.0 - fe_num, 0.0 + fe_num]
         # keep the 0.0 +, otherwise it is an array sometimes
         HelperSolidSolution.__init__(self, endmembers, molar_fractions)
@@ -139,7 +140,10 @@ def __init__(self, fe_num):
 
 class other_mg_fe_perovskite(HelperSolidSolution):
     def __init__(self, fe_num):
-        endmembers = [minerals.other.mg_perovskite(), minerals.other.fe_perovskite()]
+        endmembers = [
+            minerals.SLB_2011.mg_perovskite(),
+            minerals.SLB_2011.fe_perovskite(),
+        ]
         molar_fractions = [
             1.0 - fe_num,
             0.0 + fe_num,

contrib/CHRU2014/paper_benchmark.py

@@ -53,34 +53,24 @@ def check_slb_fig7_txt():
     temperature = np.array(data[:, 2])
     pressure = np.array(data[:, 0])
     rho = np.array(data[:, 3])
-    frho = np.empty_like(rho)
     rho_comp = np.empty_like(rho)
     Kt = np.array(data[:, 4])
-    fKt = np.empty_like(Kt)
     Kt_comp = np.empty_like(Kt)
     Ks = np.array(data[:, 5])
-    fKs = np.empty_like(Ks)
     Ks_comp = np.empty_like(Ks)
     G = np.array(data[:, 6])
-    fG = np.empty_like(G)
     G_comp = np.empty_like(G)
     VB = np.array(data[:, 7])
-    fVB = np.empty_like(VB)
     VB_comp = np.empty_like(VB)
     VS = np.array(data[:, 8])
-    fVS = np.empty_like(VS)
     VS_comp = np.empty_like(VS)
     VP = np.array(data[:, 9])
-    fVP = np.empty_like(VP)
     VP_comp = np.empty_like(VP)
     vol = np.array(data[:, 10])
-    fvol = np.empty_like(vol)
     vol_comp = np.empty_like(vol)
     alpha = np.array(data[:, 11])
-    falpha = np.empty_like(alpha)
     alpha_comp = np.empty_like(alpha)
     Cp = np.array(data[:, 12])
-    fCp = np.empty_like(Cp)
     Cp_comp = np.empty_like(Cp)
     gr = np.array(data[:, 13])
     gr_comp = np.empty_like(gr)