[cig-commits] [commit] add_thermodynamic_potentials: Removed pressure as input variable to F(V, T) and volume as input variable to Gibbs(P, T) (23f5a51)

[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 23f5a51e6976fe548903485680e5d846eb5c3924
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Sat Sep 6 15:49:47 2014 +0200

    Removed pressure as input variable to F(V,T) and volume as input variable to Gibbs(P,T)


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

23f5a51e6976fe548903485680e5d846eb5c3924
 burnman/equation_of_state.py | 4 +---
 burnman/mineral.py           | 2 +-
 burnman/slb.py               | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/burnman/equation_of_state.py b/burnman/equation_of_state.py
index cfde27d..85bf45d 100644
--- a/burnman/equation_of_state.py
+++ b/burnman/equation_of_state.py
@@ -247,12 +247,10 @@ class EquationOfState:
         """
         raise NotImplementedError("")
 
-    def helmholtz_free_energy( self, pressure, temperature, volume, params ):
+    def helmholtz_free_energy( self, temperature, volume, params ):
         """
         Parameters
         ----------
-        pressure : float
-            Pressure at which to evaluate the equation of state. [Pa]
         temperature : float
             Temperature at which to evaluate the equation of state. [K]
         volume : float
diff --git a/burnman/mineral.py b/burnman/mineral.py
index dcc7884..a52187a 100644
--- a/burnman/mineral.py
+++ b/burnman/mineral.py
@@ -136,7 +136,7 @@ class Mineral(Material):
         except (KeyError, NotImplementedError):
             self.gibbs = float('nan')
         try:
-            self.helmholtz = self.method.helmholtz_free_energy(self.pressure, self.temperature, self.V, self.params)
+            self.helmholtz = self.method.helmholtz_free_energy(self.temperature, self.V, self.params)
         except (KeyError, NotImplementedError):
             self.helmholtz = float('nan')
         
diff --git a/burnman/slb.py b/burnman/slb.py
index 7a718bb..46c4e7c 100644
--- a/burnman/slb.py
+++ b/burnman/slb.py
@@ -208,10 +208,10 @@ class SLBBase(eos.EquationOfState):
         Returns the Gibbs free energy at the pressure and temperature of the mineral [J/mol]
         """
         volume=self.volume(pressure, temperature, params)
-        G = self.helmholtz_free_energy( pressure, temperature, volume, params) + pressure * volume
+        G = self.helmholtz_free_energy( temperature, volume, params) + pressure * volume
         return G
 
-    def helmholtz_free_energy( self, pressure, temperature, volume, params):
+    def helmholtz_free_energy( self, temperature, volume, params):
         """
         Returns the Helmholtz free energy at the pressure and temperature of the mineral [J/mol]
         """