[cig-commits] [commit] add_thermodynamic_potentials: Rename classes (a1474c9)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Dec 9 09:54:29 PST 2014
Repository : https://github.com/geodynamics/burnman
On branch : add_thermodynamic_potentials
Link : https://github.com/geodynamics/burnman/compare/2e5646d93cedbbf8eae54cc37cffc14e0aa85180...d5ddad03ff9f30f5a4efaddb4e3ec585ea1a7c51
>---------------------------------------------------------------
commit a1474c96aa35b3880df1cf676957011becf71069
Author: ian-r-rose <ian.r.rose at gmail.com>
Date: Tue Sep 2 12:59:46 2014 -0700
Rename classes
>---------------------------------------------------------------
a1474c96aa35b3880df1cf676957011becf71069
burnman/minerals/HP_2011_ds62.py | 2 +-
burnman/minerals/SLB_2011_w_solid_solutions.py | 24 ++++++++++++------------
burnman/solutionmodel.py | 6 +++---
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/burnman/minerals/HP_2011_ds62.py b/burnman/minerals/HP_2011_ds62.py
index 20a6354..bb291a8 100644
--- a/burnman/minerals/HP_2011_ds62.py
+++ b/burnman/minerals/HP_2011_ds62.py
@@ -35,7 +35,7 @@ class garnet(SolidSolution):
excess_entropy=[[0., 0., 0.],[0., 0.],[0.]]
excess_volume=[[0., 0.164e-5, 0.],[0., 0.],[0.]]
- sm = AsymmetricVanLaar( endmembers, alphas, excess_enthalpy, excess_volume, excess_entropy)
+ sm = AsymmetricRegularSolution( endmembers, alphas, excess_enthalpy, excess_volume, excess_entropy)
SolidSolution.__init__(self, endmembers, sm)
diff --git a/burnman/minerals/SLB_2011_w_solid_solutions.py b/burnman/minerals/SLB_2011_w_solid_solutions.py
index 48aeb46..8c116f1 100644
--- a/burnman/minerals/SLB_2011_w_solid_solutions.py
+++ b/burnman/minerals/SLB_2011_w_solid_solutions.py
@@ -66,7 +66,7 @@ class clinopyroxene(SolidSolution):
# Interaction parameters
enthalpy_interaction=[[0., 24.74e3, 26.e3, 24.3e3],[24.74e3, 0., 0.e3], [60.53136e3, 0.0], [10.e3]]
- SolidSolution.__init__(self, base_material, SymmetricVanLaar(base_material, enthalpy_interaction) )
+ SolidSolution.__init__(self, base_material, SymmetricRegularSolution(base_material, enthalpy_interaction) )
class garnet(SolidSolution):
def __init__(self):
@@ -78,7 +78,7 @@ class garnet(SolidSolution):
# Interaction parameters
enthalply_interaction=[[0.0, 30.e3, 21.20278e3, 0.0],[0.0,0.0,0.0],[57.77596e3, 0.0],[0.0]]
- SolidSolution.__init__(self, base_material, SymmetricVanLaar(base_material, enthalpy_interaction) )
+ SolidSolution.__init__(self, base_material, SymmetricRegularSolution(base_material, enthalpy_interaction) )
class akimotoite(SolidSolution):
@@ -91,7 +91,7 @@ class akimotoite(SolidSolution):
# Interaction parameters
enthalpy_interaction=[[0.0, 66.e3],[66.e3]]
- SolidSolution.__init__(self, base_material, SymmetricVanLaar(base_material, enthalpy_interaction) )
+ SolidSolution.__init__(self, base_material, SymmetricRegularSolution(base_material, enthalpy_interaction) )
class ferropericlase(SolidSolution):
def __init__(self):
@@ -103,7 +103,7 @@ class ferropericlase(SolidSolution):
# Interaction parameters
enthalpy_interaction=[[13.e3]]
- SolidSolution.__init__(self, base_material, SymmetricVanLaar(base_material, enthalpy_interaction) )
+ SolidSolution.__init__(self, base_material, SymmetricRegularSolution(base_material, enthalpy_interaction) )
class mg_fe_olivine(SolidSolution):
def __init__(self):
@@ -115,7 +115,7 @@ class mg_fe_olivine(SolidSolution):
# Interaction parameters
enthalpy_interaction=[[7.81322e3]]
- SolidSolution.__init__(self, base_material, SymmetricVanLaar(base_material, enthalpy_interaction) )
+ SolidSolution.__init__(self, base_material, SymmetricRegularSolution(base_material, enthalpy_interaction) )
class orthopyroxene(SolidSolution):
def __init__(self):
@@ -128,7 +128,7 @@ class orthopyroxene(SolidSolution):
# Interaction parameters
enthalpy_interaction=[[0.0, 0.0, 32.11352e3],[0.0, 0.0],[48.35316e3]]
- SolidSolution.__init__(self, base_material, SymmetricVanLaar(base_material, enthalpy_interaction))
+ SolidSolution.__init__(self, base_material, SymmetricRegularSolution(base_material, enthalpy_interaction))
class plagioclase(SolidSolution):
def __init__(self):
@@ -140,7 +140,7 @@ class plagioclase(SolidSolution):
# Interaction parameters
enthalpy_interaction=[[26.0e3]]
- SolidSolution.__init__(self, base_material, SymmetricVanLaar(base_material, enthalpy_interaction))
+ SolidSolution.__init__(self, base_material, SymmetricRegularSolution(base_material, enthalpy_interaction))
class post_perovskite(SolidSolution):
def __init__(self):
@@ -153,7 +153,7 @@ class post_perovskite(SolidSolution):
# Interaction parameters
enthalpy_interaction=[[0.0, 60.0e3],[0.0]]
- SolidSolution.__init__(self, base_material, SymmetricVanLaar(base_material, enthalpy_interaction))
+ SolidSolution.__init__(self, base_material, SymmetricRegularSolution(base_material, enthalpy_interaction))
class mg_fe_perovskite(SolidSolution):
def __init__(self):
@@ -166,7 +166,7 @@ class mg_fe_perovskite(SolidSolution):
# Interaction parameters
enthalpy_interaction=[[0.0, 116.0e3],[0.0]]
- SolidSolution.__init__(self, base_material, SymmetricVanLaar(base_material, enthalpy_interaction))
+ SolidSolution.__init__(self, base_material, SymmetricRegularSolution(base_material, enthalpy_interaction))
class mg_fe_ringwoodite(SolidSolution):
def __init__(self):
@@ -179,7 +179,7 @@ class mg_fe_ringwoodite(SolidSolution):
# Interaction parameters
enthalpy_interaction=[[9.34084e3]]
- SolidSolution.__init__(self, base_material, SymmetricVanLaar(base_material, enthalpy_interaction))
+ SolidSolution.__init__(self, base_material, SymmetricRegularSolution(base_material, enthalpy_interaction))
class mg_fe_aluminous_spinel(SolidSolution):
def __init__(self):
@@ -192,7 +192,7 @@ class mg_fe_aluminous_spinel(SolidSolution):
# Interaction parameters
enthalpy_interaction=[[5.87646e3]]
- SolidSolution.__init__(self, base_material, SymmetricVanLaar(base_material, enthalpy_interaction))
+ SolidSolution.__init__(self, base_material, SymmetricRegularSolution(base_material, enthalpy_interaction))
class mg_fe_wadsleyite(SolidSolution):
def __init__(self):
@@ -205,7 +205,7 @@ class mg_fe_wadsleyite(SolidSolution):
# Interaction parameters
enthalpy_interaction=[[16.74718e3]]
- SolidSolution.__init__(self, base_material, SymmetricVanLaar(base_material, enthalpy_interaction) )
+ SolidSolution.__init__(self, base_material, SymmetricRegularSolution(base_material, enthalpy_interaction) )
'''
ENDMEMBERS
diff --git a/burnman/solutionmodel.py b/burnman/solutionmodel.py
index a091cc2..3762107 100644
--- a/burnman/solutionmodel.py
+++ b/burnman/solutionmodel.py
@@ -120,7 +120,7 @@ class IdealSolution ( SolutionModel ):
return activities
-class AsymmetricVanLaar ( IdealSolution ):
+class AsymmetricRegularSolution ( IdealSolution ):
"""
Solution model implementing the Asymmetric Van Laar formulation
(best reference?).
@@ -183,12 +183,12 @@ class AsymmetricVanLaar ( IdealSolution ):
-class SymmetricVanLaar ( AsymmetricVanLaar ):
+class SymmetricRegularSolution ( AsymmetricRegularSolution ):
"""
Solution model implementing the Symmetric Van Laar solution
"""
def __init__( self, endmembers, enthalpy_interaction, volume_interaction = None, entropy_ineraction = None ):
#symmetric case if all the alphas are equal?
alphas = np.ones( len(endmembers) )
- AsymmetricVanLaar.__init__(self, endmembers, alphas, enthalpy_interaction, volume_ineteraction, entropy_interaction )
+ AsymmetricRegularSolution.__init__(self, endmembers, alphas, enthalpy_interaction, volume_ineteraction, entropy_interaction )
More information about the CIG-COMMITS
mailing list