[cig-commits] [commit] add_thermodynamic_potentials: Minor corrections (2dff620)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Tue Dec 9 09:53:28 PST 2014


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

On branch  : add_thermodynamic_potentials
Link       : https://github.com/geodynamics/burnman/compare/2e5646d93cedbbf8eae54cc37cffc14e0aa85180...d5ddad03ff9f30f5a4efaddb4e3ec585ea1a7c51

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

commit 2dff620d176446eb902a99e1958034e772a752a6
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Sun Aug 10 23:49:43 2014 +0200

    Minor corrections


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

2dff620d176446eb902a99e1958034e772a752a6
 burnman/minerals/HP_2011.py | 2 +-
 burnman/modified_tait.py    | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/burnman/minerals/HP_2011.py b/burnman/minerals/HP_2011.py
index 44bfccd..f4cd3af 100644
--- a/burnman/minerals/HP_2011.py
+++ b/burnman/minerals/HP_2011.py
@@ -36,7 +36,7 @@ class stishovite (Mineral):
     """
     def __init__(self):
         self.params = {
-            'formula': '[Si][O]2',
+            'formula': 'SiO2',
             'equation_of_state': 'mtait',
             'H_0': -876.39e3,
             'S_0': 24.0,
diff --git a/burnman/modified_tait.py b/burnman/modified_tait.py
index 4a93514..94c21be 100644
--- a/burnman/modified_tait.py
+++ b/burnman/modified_tait.py
@@ -45,9 +45,6 @@ class MTaitBase(eos.EquationOfState):
     and Holland and Powell (2011; followed here).
     """
 
-    #def __init__(self):
-    #    pass
-
     def grueneisen_parameter(self, pressure, temperature, volume, params):
         """
         Returns grueneisen parameter [unitless] as a function of pressure,
@@ -84,7 +81,7 @@ class MTaitBase(eos.EquationOfState):
         psubpth=pressure-Pth
         return params['K_0']*(1. + b(psubpth))*(a + (1.-a)*pow((1. + b(psubpth)), c))
 
-    #calculate the mgd shear modulus as a function of P, V, and T
+    #calculate the shear modulus as a function of P, V, and T
     def shear_modulus(self, pressure, temperature, volume, params):
         """
         Not implemented. 



More information about the CIG-COMMITS mailing list