[cig-commits] [commit] add_thermodynamic_potentials: Corrected sign of S excess (7fbd0e4)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/burnman

On branch  : add_thermodynamic_potentials
Link       : https://github.com/geodynamics/burnman/compare/2e5646d93cedbbf8eae54cc37cffc14e0aa85180...d5ddad03ff9f30f5a4efaddb4e3ec585ea1a7c51

>---------------------------------------------------------------

commit 7fbd0e4d9321f47fed5130d087fd6072937781e4
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Sat Aug 30 21:41:34 2014 +0200

    Corrected sign of S excess


>---------------------------------------------------------------

7fbd0e4d9321f47fed5130d087fd6072937781e4
 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