[cig-commits] [commit] master: Corrected enthalpy derivation in SLB (ff29c6a)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/7c010ac6610ee014aabcb76a2a4f667a06a8e7f7...fb1efda477c84dda519a26fcd6480eef1f23c1cf

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

commit ff29c6af52af598aba5b394a59a07a54d17b8ae5
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Fri Dec 12 22:54:05 2014 -0800

    Corrected enthalpy derivation in SLB


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

ff29c6af52af598aba5b394a59a07a54d17b8ae5
 burnman/eos/slb.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/burnman/eos/slb.py b/burnman/eos/slb.py
index 7aa0934..4687c85 100644
--- a/burnman/eos/slb.py
+++ b/burnman/eos/slb.py
@@ -230,7 +230,8 @@ class SLBBase(eos.EquationOfState):
         """
         
         return self.helmholtz_free_energy( pressure, temperature, volume, params) + \
-               temperature * self.entropy( pressure, temperature, volume, params)
+               temperature * self.entropy( pressure, temperature, volume, params) + \
+               pressure * self.volume( pressure, temperature, params)
 
     def helmholtz_free_energy( self, pressure, temperature, volume, params):
         """