[cig-commits] [commit] inversion, master, validate_MT_params: Bugfix (751c366)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Dec 12 18:25:30 PST 2014
Repository : https://github.com/geodynamics/burnman
On branches: inversion,master,validate_MT_params
Link : https://github.com/geodynamics/burnman/compare/80c2a295c42dfdb38f83f6c1334bf7d8f97a8463...409647ff05dfad6a686198cac1481bd46b5e2e62
>---------------------------------------------------------------
commit 751c36617cc2262bd96f7e2ab5f15ae7eb2f0669
Author: ian-r-rose <ian.r.rose at gmail.com>
Date: Tue Sep 2 18:28:04 2014 -0700
Bugfix
>---------------------------------------------------------------
751c36617cc2262bd96f7e2ab5f15ae7eb2f0669
burnman/solutionmodel.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/burnman/solutionmodel.py b/burnman/solutionmodel.py
index e2d3f2b..7f6ada7 100644
--- a/burnman/solutionmodel.py
+++ b/burnman/solutionmodel.py
@@ -92,16 +92,17 @@ class IdealSolution ( SolutionModel ):
def configurational_entropy (self, molar_fractions):
activities = self.ideal_activities( molar_fractions )
- gibbs_excess_ideal = 0.0
+ conf_entropy = 0.0
tol = 1.e-10
for i in range(self.n_endmembers):
if molar_fractions[i] > tol:
- configurational_entropy = configurational_entropy - \
- molar_fractions[i] * R * np.log(activities[i])
+ conf_entropy = conf_entropy - \
+ molar_fractions[i] * R * np.log(activities[i])
+ return conf_entropy
def ideal_gibbs_excess( self, temperature, molar_fractions ):
- return 0.0 - temperature*configurational_entropy(molar_fractions)
+ return -temperature*self.configurational_entropy(molar_fractions)
def ideal_activities ( self, molar_fractions ):
More information about the CIG-COMMITS
mailing list