[cig-commits] [commit] inversion, master, validate_MT_params: Corrected sign of S excess (43d6979)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Dec 12 18:25:24 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 43d69799b72eaa7177d83bbd24fa74c844afe527
Author: Bob Myhill <myhill.bob at gmail.com>
Date: Sat Aug 30 21:41:34 2014 +0200
Corrected sign of S excess
>---------------------------------------------------------------
43d69799b72eaa7177d83bbd24fa74c844afe527
burnman/solidsolution.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/burnman/solidsolution.py b/burnman/solidsolution.py
index 44198d6..18a3ee6 100644
--- a/burnman/solidsolution.py
+++ b/burnman/solidsolution.py
@@ -135,9 +135,8 @@ class SolidSolution(Mineral):
phi=np.divide(phi, np.sum(phi))
self.H_excess=np.dot(self.alpha.T,molar_fraction)*np.dot(phi.T,np.dot(self.Wh,phi))
- self.S_deficit=np.dot(self.alpha.T,molar_fraction)*np.dot(phi.T,np.dot(self.Ws,phi))
+ self.S_excess=np.dot(self.alpha.T,molar_fraction)*np.dot(phi.T,np.dot(self.Ws,phi))
self.V_excess=np.dot(self.alpha.T,molar_fraction)*np.dot(phi.T,np.dot(self.Wv,phi))
- self.S_excess=0.0-S_deficit
def set_state(self, pressure, temperature, molar_fraction):
# Set the state of all the endmembers
More information about the CIG-COMMITS
mailing list