[cig-commits] [commit] add_thermodynamic_potentials: add self (8c85406)

[cig_noreply at geodynamics.org]

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

On branch  : add_thermodynamic_potentials
Link       : https://github.com/geodynamics/burnman/compare/25dfc72def186ba22c20054e7fba8c0e0078c398...8c85406daba289e4e473140f1363cd99a00a2bb8

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

commit 8c85406daba289e4e473140f1363cd99a00a2bb8
Author: sannecottaar <sanne.cottaar at gmail.com>
Date:   Thu Dec 11 10:43:44 2014 -0800

    add self


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

8c85406daba289e4e473140f1363cd99a00a2bb8
 burnman/solidsolution.py |  2 +-
 burnman/solutionmodel.py | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/burnman/solidsolution.py b/burnman/solidsolution.py
index ad7b74a..d23599d 100644
--- a/burnman/solidsolution.py
+++ b/burnman/solidsolution.py
@@ -84,4 +84,4 @@ class SolidSolution(Mineral):
         return sum([ self.base_material[i][0].calcgibbs(pressure, temperature) * molar_fractions[i] for i in range(self.n_endmembers) ]) + self.solution_model.excess_gibbs_free_energy( pressure, temperature, molar_fractions)
 
     def calcpartialgibbsexcesses(self, pressure, temperature, molar_fractions):
-        return self.solution_model.excess_partial_gibbs_free_energies( pressure, temperature, molar_fractions)
+        return self.solution_model.excess_partial_gibbs_free_energies(self, pressure, temperature, molar_fractions)
diff --git a/burnman/solutionmodel.py b/burnman/solutionmodel.py
index f00de6a..dde527c 100644
--- a/burnman/solutionmodel.py
+++ b/burnman/solutionmodel.py
@@ -215,7 +215,7 @@ class AsymmetricRegularSolution ( IdealSolution ):
         # -sum(sum(qi.qj.Wij*)
         # equation (2) of Holland and Powell 2003
 
-        phi=_phi(molar_fractions)
+        phi=self._phi(molar_fractions)
 
         q=np.zeros(len(molar_fractions))
         Hint=np.zeros(len(molar_fractions))
@@ -239,21 +239,21 @@ class AsymmetricRegularSolution ( IdealSolution ):
     def excess_partial_gibbs_free_energies( self, pressure, temperature, molar_fractions ):
 
         ideal_gibbs = IdealSolution._ideal_excess_partial_gibbs (self, temperature, molar_fractions )
-        non_ideal_gibbs = self._non_ideal_excess_partial_gibbs( pressure, temperature, molar_fractions)
+        non_ideal_gibbs = self._non_ideal_excess_partial_gibbs(pressure, temperature, molar_fractions)
         return ideal_gibbs + non_ideal_gibbs
 
     def excess_volume ( self, pressure, temperature, molar_fractions ):
-        phi=_phi(molar_fractions)
+        phi=self._phi(molar_fractions)
         V_excess=np.dot(self.alpha.T,molar_fractions)*np.dot(phi.T,np.dot(self.Wv,phi))
         return V_excess
 
     def excess_entropy( self, pressure, temperature, molar_fractions ):
-        phi=_phi(molar_fractions)
+        phi=self._phi(molar_fractions)
         S_excess=np.dot(self.alpha.T,molar_fractions)*np.dot(phi.T,np.dot(self.Ws,phi))
-        return IdealSolution._ideal_excess_partial_gibbs (temperature, molar_fractions ) + S_excess
+        return IdealSolution._ideal_excess_partial_gibbs (self,temperature, molar_fractions ) + S_excess
 
     def excess_enthalpy( self, pressure, temperature, molar_fractions ):
-        phi=_phi(molar_fractions)
+        phi=self._phi(molar_fractions)
         H_excess=np.dot(self.alpha.T,molar_fractions)*np.dot(phi.T,np.dot(self.Wh,phi))
         return H_excess + pressure*self.excess_volume ( pressure, temperature, molar_fractions )