[cig-commits] [commit] inversion, master, validate_MT_params: add entropy to EOS, remove volume parameter (2148b32)

[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 2148b324d3e8aa7b527f831eb397590942563008
Author: Timo Heister <timo.heister at gmail.com>
Date:   Thu Dec 11 16:20:32 2014 -0800

    add entropy to EOS, remove volume parameter


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

2148b324d3e8aa7b527f831eb397590942563008
 burnman/equation_of_state.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/burnman/equation_of_state.py b/burnman/equation_of_state.py
index 9f8ecd2..2fe41ae 100644
--- a/burnman/equation_of_state.py
+++ b/burnman/equation_of_state.py
@@ -246,7 +246,7 @@ class EquationOfState(object):
             return 300.0
 
 
-    def gibbs_free_energy( self, pressure, temperature, volume, params ):
+    def gibbs_free_energy( self, pressure, temperature, params ):
         """
         Parameters
         ----------
@@ -286,8 +286,14 @@ class EquationOfState(object):
         """
         raise NotImplementedError("")
 
+    def entropy( self, pressure, temperature, params):
+        """
+        Returns the entropy at the pressure and temperature of the mineral [J/K/mol]
+        """
+
+        raise NotImplementedError("")
 
-    def enthalpy( self, pressure, temperature, volume, params ):
+    def enthalpy( self, pressure, temperature, params ):
         """
         Parameters
         ----------
@@ -295,9 +301,6 @@ class EquationOfState(object):
             Pressure at which to evaluate the equation of state. [Pa]
         temperature : float
             Temperature at which to evaluate the equation of state. [K]
-        volume : float
-            Molar volume of the mineral.  For consistency this should be calculated
-            using :func:`volume`. [m^3]
         params : dictionary
             Dictionary containing material parameters required by the equation of state.