[cig-commits] [commit] HP_fluids: R to constants.gas_constant (4711725)

[cig_noreply at geodynamics.org]

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

On branch  : HP_fluids
Link       : https://github.com/geodynamics/burnman/compare/f08d6f01b92e8e50a011905ae64c4e55e5844d01...4711725b8d4491fa195e5b6260e3cd658c178b28

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

commit 4711725b8d4491fa195e5b6260e3cd658c178b28
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Fri Dec 12 17:53:48 2014 -0800

    R to constants.gas_constant


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

4711725b8d4491fa195e5b6260e3cd658c178b28
 burnman/eos/cork.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/burnman/eos/cork.py b/burnman/eos/cork.py
index 3369cda..cbfe7d2 100644
--- a/burnman/eos/cork.py
+++ b/burnman/eos/cork.py
@@ -41,7 +41,7 @@ class CORK(eos.EquationOfState):
         Eq. 7 in Holland and Powell, 1991
         """
         cork=cork_variables(params['cork_params'], params['cork_P'], params['cork_T'], temperature)
-        V = R*temperature/pressure + (cork[1] - cork[0]*R*np.sqrt(temperature)/((R*temperature + cork[1]*pressure)*(R*temperature + 2.*cork[1]*pressure)) + cork[2]*np.sqrt(pressure) + cork[3]*pressure)
+        V = constants.gas_constant*temperature/pressure + (cork[1] - cork[0]*constants.gas_constant*np.sqrt(temperature)/((constants.gas_constant*temperature + cork[1]*pressure)*(constants.gas_constant*temperature + 2.*cork[1]*pressure)) + cork[2]*np.sqrt(pressure) + cork[3]*pressure)
         return V
 
     def isothermal_bulk_modulus(self, pressure,temperature,volume, params):
@@ -113,7 +113,7 @@ class CORK(eos.EquationOfState):
         else:
             cork=cork_variables(params['cork_params'], params['cork_P'], params['cork_T'], temperature)
         
-            RTlnf = R*temperature*np.log(1e-5*pressure) + cork[1]*pressure + cork[0]/(cork[1]*np.sqrt(temperature))*(np.log(R*temperature + cork[1]*pressure) - np.log(R*temperature + 2.*cork[1]*pressure)) + 2./3.*cork[2]*pressure*np.sqrt(pressure) + cork[3]/2.*pressure*pressure  # Eq. 8 in Holland and Powell, 1991
+            RTlnf = constants.gas_constant*temperature*np.log(1e-5*pressure) + cork[1]*pressure + cork[0]/(cork[1]*np.sqrt(temperature))*(np.log(constants.gas_constant*temperature + cork[1]*pressure) - np.log(constants.gas_constant*temperature + 2.*cork[1]*pressure)) + 2./3.*cork[2]*pressure*np.sqrt(pressure) + cork[3]/2.*pressure*pressure  # Eq. 8 in Holland and Powell, 1991
 
         return params['H_0'] + intCpdT - temperature*(params['S_0'] + intCpoverTdT) + RTlnf