[cig-commits] [commit] add_gibbs_energy: Rename classes (e0dc4ab)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Dec 11 17:11:44 PST 2014
Repository : https://github.com/geodynamics/burnman
On branch : add_gibbs_energy
Link : https://github.com/geodynamics/burnman/compare/0000000000000000000000000000000000000000...2148b324d3e8aa7b527f831eb397590942563008
>---------------------------------------------------------------
commit e0dc4ab7c8ef557811336645ae869fd5de7b04ca
Author: Timo Heister <timo.heister at gmail.com>
Date: Thu Dec 11 15:28:53 2014 -0800
Rename classes
Conflicts:
burnman/minerals/HP_2011_ds62.py
burnman/minerals/SLB_2011_w_solid_solutions.py
>---------------------------------------------------------------
e0dc4ab7c8ef557811336645ae869fd5de7b04ca
burnman/solutionmodel.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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