[cig-commits] [commit] split_mt: Name change: mtait -> mt for function-name consistency (6e4d527)

[cig_noreply at geodynamics.org]

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

On branch  : split_mt
Link       : https://github.com/geodynamics/burnman/compare/a4841fefedd86e6558f0d90dece082c0bc11c99f...6e4d5274b4525cd2094a4ee96690027a21060a37

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

commit 6e4d5274b4525cd2094a4ee96690027a21060a37
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Sun Jan 4 17:20:12 2015 +0100

    Name change: mtait -> mt for function-name consistency


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

6e4d5274b4525cd2094a4ee96690027a21060a37
 burnman/eos/__init__.py                 | 2 +-
 burnman/eos/helper.py                   | 4 ++--
 burnman/eos/hp.py                       | 2 +-
 misc/benchmarks/endmember_benchmarks.py | 2 +-
 misc/ref/endmember_benchmarks.py.out    | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/burnman/eos/__init__.py b/burnman/eos/__init__.py
index 00b4cb2..3cb62cc 100644
--- a/burnman/eos/__init__.py
+++ b/burnman/eos/__init__.py
@@ -14,7 +14,7 @@ from birch_murnaghan import BM2, BM3
 from mie_grueneisen_debye import MGD2, MGD3
 from slb import SLB2, SLB3
 from modified_tait import MT
-from hp import HPMT
+from hp import HP_TMT
 from cork import CORK
 
 from helper import create
diff --git a/burnman/eos/helper.py b/burnman/eos/helper.py
index 123f5b2..f97a81c 100644
--- a/burnman/eos/helper.py
+++ b/burnman/eos/helper.py
@@ -30,10 +30,10 @@ def create(method):
             return bm.BM2()
         elif method == "bm3":
             return bm.BM3()
-        elif method == "mtait":
+        elif method == "mt":
             return mt.MT()
         elif method == "hp_tmt":
-            return hp.HPMT()
+            return hp.HP_TMT()
         elif method == "cork":
             return cork.CORK()
         else:
diff --git a/burnman/eos/hp.py b/burnman/eos/hp.py
index afe2a79..ebe38a8 100644
--- a/burnman/eos/hp.py
+++ b/burnman/eos/hp.py
@@ -17,7 +17,7 @@ T_0=298.15 # Standard temperature = 25 C
 P_0=1.e5 # Standard pressure = 1.e5 Pa
 
 
-class HPMT(eos.EquationOfState):
+class HP_TMT(eos.EquationOfState):
     """
     Base class for a generic modified Tait equation of state.  
     References for this can be found in Huang and Chow (1974) 
diff --git a/misc/benchmarks/endmember_benchmarks.py b/misc/benchmarks/endmember_benchmarks.py
index 06f23b0..d8dfc1a 100644
--- a/misc/benchmarks/endmember_benchmarks.py
+++ b/misc/benchmarks/endmember_benchmarks.py
@@ -52,7 +52,7 @@ for database, f, mineral in filemin:
 variables=['V','beta','rho']
     
 fo = HP_2011_ds62.fo()
-fo.set_method('mtait')
+fo.set_method('mt')
 percentage_diff=[]
 PT=[]
 
diff --git a/misc/ref/endmember_benchmarks.py.out b/misc/ref/endmember_benchmarks.py.out
index a81b2c8..edcf29a 100644
--- a/misc/ref/endmember_benchmarks.py.out
+++ b/misc/ref/endmember_benchmarks.py.out
@@ -1,4 +1,4 @@
-<stdin>:55: UserWarning: Overriding database equation of state. From HPMT to MT
+<stdin>:55: UserWarning: Overriding database equation of state. From HP_TMT to MT
 Benchmarks for SLB2011 database with method slb3
 ['H', 'S', 'V', 'C_p', 'alpha', 'beta', 'rho']
 [0.00017156026591432655, 0.0002055800239183733, -6.4391026211448567e-05, 0.00014642709264959587, 0.00027680790069709911, 0.0043841690680523288, -0.0013546021287755491, -0.00014635661915870913]
@@ -21,7 +21,7 @@ Benchmarks for HP2011 database with method hp_tmt
 Maximum error in HP2011 database:
 alpha : 2.82198466083e-05 % at 0.0001 GPa and 1000.0 K
 
-Benchmarks for HP2011 database with method mtait
+Benchmarks for HP2011 database with method mt
 ['V', 'beta', 'rho']
 [7.7820925661860693e-07, 3.5713065344384812e-05, -2.292568834341453e-05]
 [4.0270311222739116e-06, 3.7028365245184261e-08, -2.2393157908795917e-05]