[cig-commits] [commit] add_thermodynamic_potentials, inversion, master, validate_MT_params: change mgd to include new reference temperatuer option. (4d13866)

[cig_noreply at geodynamics.org]

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

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

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

commit 4d1386673c2a123832aa9da893be8b16fb139106
Author: nknezek <nknezek at gmail.com>
Date:   Thu Jul 24 11:41:40 2014 -0700

    change mgd to include new reference temperatuer option.


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

4d1386673c2a123832aa9da893be8b16fb139106
 burnman/mie_grueneisen_debye.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/burnman/mie_grueneisen_debye.py b/burnman/mie_grueneisen_debye.py
index 4f0b0fe..b06a032 100644
--- a/burnman/mie_grueneisen_debye.py
+++ b/burnman/mie_grueneisen_debye.py
@@ -29,13 +29,14 @@ class MGDBase(eos.EquationOfState):
         return self.__grueneisen_parameter(params['V_0']/volume, params)
 
     def volume(self, pressure,temperature,params):
+        T_0 = self.reference_temperature( params )
         """
         Returns volume [m^3] as a function of pressure [Pa] and temperature [K]
         EQ B7
         """
         func = lambda x: bm.birch_murnaghan(params['V_0']/x, params) + \
             self.__thermal_pressure(temperature, x, params) - \
-            self.__thermal_pressure(300., x, params) - pressure
+            self.__thermal_pressure(T_0, x, params) - pressure
         V = opt.brentq(func, 0.5*params['V_0'], 1.5*params['V_0'])
         return V
 
@@ -44,9 +45,10 @@ class MGDBase(eos.EquationOfState):
         Returns isothermal bulk modulus [Pa] as a function of pressure [Pa],
         temperature [K], and volume [m^3].  EQ B8
         """
+        T_0 = self.reference_temperature( params )
         K_T = bm.bulk_modulus(volume, params) + \
             self.__thermal_bulk_modulus(temperature,volume, params) - \
-            self.__thermal_bulk_modulus(300.,volume, params)  #EQB13
+            self.__thermal_bulk_modulus(T_0,volume, params)  #EQB13
         return K_T
 
     #calculate the mgd shear modulus as a function of P, V, and T
@@ -55,14 +57,15 @@ class MGDBase(eos.EquationOfState):
         Returns shear modulus [Pa] as a function of pressure [Pa],
         temperature [K], and volume [m^3].  EQ B11
         """
+        T_0 = self.reference_temperature( params )
         if self.order==2:
             return bm.shear_modulus_second_order(volume,params) + \
                 self.__thermal_shear_modulus(temperature,volume, params) - \
-                self.__thermal_shear_modulus(300.,volume, params) # EQ B11
+                self.__thermal_shear_modulus(T_0,volume, params) # EQ B11
         elif self.order==3:
             return bm.shear_modulus_third_order(volume,params) + \
                 self.__thermal_shear_modulus(temperature,volume, params) - \
-                self.__thermal_shear_modulus(300.,volume, params) # EQ B11
+                self.__thermal_shear_modulus(T_0,volume, params) # EQ B11
         else:
             raise NotImplementedError("")
 
@@ -112,9 +115,10 @@ class MGDBase(eos.EquationOfState):
         Returns pressure [Pa] as a function of temperature [K] and volume[m^3]
         EQ B7
         """
+        T_0 = self.reference_temperature( params )
         return bm.birch_murnaghan(params['V_0']/volume, params) + \
                 self.__thermal_pressure(temperature,volume, params) - \
-                self.__thermal_pressure(300.,volume, params)
+                self.__thermal_pressure(T_0,volume, params)
 
     #calculate the thermal correction to the shear modulus as a function of V, T
     def __thermal_shear_modulus(self, T, V, params):