[cig-commits] [commit] inversion, master, validate_MT_params: Removed pressure as input variable to F(V, T) and volume as input variable to Gibbs(P, T) (b2549c6)

[cig_noreply at geodynamics.org]

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

On branches: inversion,master,validate_MT_params
Link       : https://github.com/geodynamics/burnman/compare/80c2a295c42dfdb38f83f6c1334bf7d8f97a8463...409647ff05dfad6a686198cac1481bd46b5e2e62

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

commit b2549c63a84a17713a79d8f014de64e4429353b9
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)


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

b2549c63a84a17713a79d8f014de64e4429353b9
 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 8b4cfd9..9f8ecd2 100644
--- a/burnman/equation_of_state.py
+++ b/burnman/equation_of_state.py
@@ -267,12 +267,10 @@ class EquationOfState(object):
         """
         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 5bde001..6238d22 100644
--- a/burnman/mineral.py
+++ b/burnman/mineral.py
@@ -152,7 +152,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 9d2d45f..2133611 100644
--- a/burnman/slb.py
+++ b/burnman/slb.py
@@ -211,10 +211,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]
         """