[cig-commits] [commit] add_thermodynamic_potentials: Minor bug fix (36b750b)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Dec 9 09:57:10 PST 2014
Repository : https://github.com/geodynamics/burnman
On branch : add_thermodynamic_potentials
Link : https://github.com/geodynamics/burnman/compare/2e5646d93cedbbf8eae54cc37cffc14e0aa85180...d5ddad03ff9f30f5a4efaddb4e3ec585ea1a7c51
>---------------------------------------------------------------
commit 36b750b8ffe397bd7b4792cf19f30e5767927fa5
Author: Bob Myhill <myhill.bob at gmail.com>
Date: Sun Sep 7 22:53:32 2014 +0100
Minor bug fix
>---------------------------------------------------------------
36b750b8ffe397bd7b4792cf19f30e5767927fa5
burnman/HHPH2013data_to_burnman.py | 2 +-
burnman/minerals/HHPH_2013.py | 86 +++++++++++++++++++-------------------
2 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/burnman/HHPH2013data_to_burnman.py b/burnman/HHPH2013data_to_burnman.py
index 15ee214..fe68185 100644
--- a/burnman/HHPH2013data_to_burnman.py
+++ b/burnman/HHPH2013data_to_burnman.py
@@ -51,7 +51,7 @@ for idx, m in enumerate(ds):
if pid > 1 and pid != 3 and pid<6:
print ' \''+param_names[pid]+'\':', float(param)*param_scales[pid], ','
- print ' \'Cp:\'', [round(float(m[i])*param_scales[i],10) for i in [6, 7, 8, 9]], ','
+ print ' \'Cp\':', [round(float(m[i])*param_scales[i],10) for i in [6, 7, 8, 9]], ','
for pid, param in enumerate(m):
if pid > 9:
print ' \''+param_names[pid]+'\':', float(param)*param_scales[pid], ','
diff --git a/burnman/minerals/HHPH_2013.py b/burnman/minerals/HHPH_2013.py
index 1973bd0..9c81b92 100644
--- a/burnman/minerals/HHPH_2013.py
+++ b/burnman/minerals/HHPH_2013.py
@@ -32,7 +32,7 @@ class fo (Mineral):
'H_0': -2172450.0 ,
'S_0': 95.1 ,
'V_0': 4.366e-05 ,
- 'Cp:' [233.3, 0.001494, -603800.0, -1869.7] ,
+ 'Cp': [233.3, 0.001494, -603800.0, -1869.7] ,
'a_0': 2.85e-05 ,
'K_0': 1.285e+11 ,
'Kprime_0': 3.84 ,
@@ -54,7 +54,7 @@ class fa (Mineral):
'H_0': -1477740.0 ,
'S_0': 151.0 ,
'V_0': 4.631e-05 ,
- 'Cp:' [201.1, 0.01733, -1960600.0, -900.9] ,
+ 'Cp': [201.1, 0.01733, -1960600.0, -900.9] ,
'a_0': 2.82e-05 ,
'K_0': 1.256e+11 ,
'Kprime_0': 4.68 ,
@@ -76,7 +76,7 @@ class mwd (Mineral):
'H_0': -2138080.0 ,
'S_0': 93.9 ,
'V_0': 4.051e-05 ,
- 'Cp:' [208.7, 0.003942, -1709500.0, -1302.8] ,
+ 'Cp': [208.7, 0.003942, -1709500.0, -1302.8] ,
'a_0': 2.37e-05 ,
'K_0': 1.726e+11 ,
'Kprime_0': 3.84 ,
@@ -98,7 +98,7 @@ class fwd (Mineral):
'H_0': -1467920.0 ,
'S_0': 146.0 ,
'V_0': 4.321e-05 ,
- 'Cp:' [201.1, 0.01733, -1960600.0, -900.9] ,
+ 'Cp': [201.1, 0.01733, -1960600.0, -900.9] ,
'a_0': 2.73e-05 ,
'K_0': 1.69e+11 ,
'Kprime_0': 4.35 ,
@@ -120,7 +120,7 @@ class mrw (Mineral):
'H_0': -2126840.0 ,
'S_0': 90.0 ,
'V_0': 3.949e-05 ,
- 'Cp:' [213.3, 0.00269, -1410400.0, -1495.9] ,
+ 'Cp': [213.3, 0.00269, -1410400.0, -1495.9] ,
'a_0': 2.01e-05 ,
'K_0': 1.781e+11 ,
'Kprime_0': 4.35 ,
@@ -142,7 +142,7 @@ class frw (Mineral):
'H_0': -1471760.0 ,
'S_0': 140.0 ,
'V_0': 4.203e-05 ,
- 'Cp:' [166.8, 0.04261, -1705400.0, -541.4] ,
+ 'Cp': [166.8, 0.04261, -1705400.0, -541.4] ,
'a_0': 2.22e-05 ,
'K_0': 1.977e+11 ,
'Kprime_0': 4.92 ,
@@ -164,7 +164,7 @@ class mpv (Mineral):
'H_0': -1442310.0 ,
'S_0': 62.6 ,
'V_0': 2.445e-05 ,
- 'Cp:' [149.3, 0.002918, -2983000.0, -799.1] ,
+ 'Cp': [149.3, 0.002918, -2983000.0, -799.1] ,
'a_0': 1.87e-05 ,
'K_0': 2.51e+11 ,
'Kprime_0': 4.14 ,
@@ -186,7 +186,7 @@ class fpv (Mineral):
'H_0': -1082910.0 ,
'S_0': 95.0 ,
'V_0': 2.534e-05 ,
- 'Cp:' [133.2, 0.01083, -3661400.0, -314.7] ,
+ 'Cp': [133.2, 0.01083, -3661400.0, -314.7] ,
'a_0': 1.87e-05 ,
'K_0': 2.81e+11 ,
'Kprime_0': 4.14 ,
@@ -208,7 +208,7 @@ class apv (Mineral):
'H_0': -1619990.0 ,
'S_0': 51.8 ,
'V_0': 2.54e-05 ,
- 'Cp:' [139.5, 0.00589, -2460600.0, -589.2] ,
+ 'Cp': [139.5, 0.00589, -2460600.0, -589.2] ,
'a_0': 1.8e-05 ,
'K_0': 2.03e+11 ,
'Kprime_0': 4.0 ,
@@ -230,7 +230,7 @@ class npv (Mineral):
'H_0': -1365000.0 ,
'S_0': 63.0 ,
'V_0': 2.334e-05 ,
- 'Cp:' [135.0, 0.00846, -1850300.0, -600.8] ,
+ 'Cp': [135.0, 0.00846, -1850300.0, -600.8] ,
'a_0': 1.8e-05 ,
'K_0': 2.03e+11 ,
'Kprime_0': 4.0 ,
@@ -252,7 +252,7 @@ class cpv (Mineral):
'H_0': -1533590.0 ,
'S_0': 74.5 ,
'V_0': 2.745e-05 ,
- 'Cp:' [159.3, 0.0, -967300.0, -1075.4] ,
+ 'Cp': [159.3, 0.0, -967300.0, -1075.4] ,
'a_0': 2e-05 ,
'K_0': 2.36e+11 ,
'Kprime_0': 3.9 ,
@@ -274,7 +274,7 @@ class mak (Mineral):
'H_0': -1489610.0 ,
'S_0': 59.3 ,
'V_0': 2.635e-05 ,
- 'Cp:' [147.8, 0.002015, -2395000.0, -801.8] ,
+ 'Cp': [147.8, 0.002015, -2395000.0, -801.8] ,
'a_0': 2.12e-05 ,
'K_0': 2.11e+11 ,
'Kprime_0': 4.55 ,
@@ -296,7 +296,7 @@ class fak (Mineral):
'H_0': -1142130.0 ,
'S_0': 91.5 ,
'V_0': 2.76e-05 ,
- 'Cp:' [100.3, 0.013328, -4364900.0, 419.8] ,
+ 'Cp': [100.3, 0.013328, -4364900.0, 419.8] ,
'a_0': 2.12e-05 ,
'K_0': 2.18e+11 ,
'Kprime_0': 4.55 ,
@@ -318,7 +318,7 @@ class maj (Mineral):
'H_0': -6041550.0 ,
'S_0': 260.2 ,
'V_0': 0.00011457 ,
- 'Cp:' [713.6, -0.000997, -1158200.0, -6622.3] ,
+ 'Cp': [713.6, -0.000997, -1158200.0, -6622.3] ,
'a_0': 1.83e-05 ,
'K_0': 1.6e+11 ,
'Kprime_0': 4.56 ,
@@ -340,7 +340,7 @@ class nagt (Mineral):
'H_0': -5985000.0 ,
'S_0': 260.6 ,
'V_0': 0.0001109 ,
- 'Cp:' [620.8, 0.0112, -3755900.0, -4421.3] ,
+ 'Cp': [620.8, 0.0112, -3755900.0, -4421.3] ,
'a_0': 2.1e-05 ,
'K_0': 1.7e+11 ,
'Kprime_0': 4.0 ,
@@ -362,7 +362,7 @@ class py (Mineral):
'H_0': -6281770.0 ,
'S_0': 269.5 ,
'V_0': 0.00011313 ,
- 'Cp:' [633.5, 0.0, -5196100.0, -4315.2] ,
+ 'Cp': [633.5, 0.0, -5196100.0, -4315.2] ,
'a_0': 2.37e-05 ,
'K_0': 1.743e+11 ,
'Kprime_0': 4.05 ,
@@ -384,7 +384,7 @@ class alm (Mineral):
'H_0': -5260750.0 ,
'S_0': 342.0 ,
'V_0': 0.00011525 ,
- 'Cp:' [677.3, 0.0, -3772700.0, -5044.0] ,
+ 'Cp': [677.3, 0.0, -3772700.0, -5044.0] ,
'a_0': 2.12e-05 ,
'K_0': 1.9e+11 ,
'Kprime_0': 2.98 ,
@@ -406,7 +406,7 @@ class gr (Mineral):
'H_0': -6643050.0 ,
'S_0': 255.0 ,
'V_0': 0.00012535 ,
- 'Cp:' [626.0, 0.0, -5779200.0, -4002.9] ,
+ 'Cp': [626.0, 0.0, -5779200.0, -4002.9] ,
'a_0': 2.2e-05 ,
'K_0': 1.72e+11 ,
'Kprime_0': 5.53 ,
@@ -428,7 +428,7 @@ class en (Mineral):
'H_0': -3090100.0 ,
'S_0': 132.5 ,
'V_0': 6.262e-05 ,
- 'Cp:' [356.2, -0.00299, -596900.0, -3185.3] ,
+ 'Cp': [356.2, -0.00299, -596900.0, -3185.3] ,
'a_0': 2.27e-05 ,
'K_0': 1.059e+11 ,
'Kprime_0': 8.65 ,
@@ -450,7 +450,7 @@ class cen (Mineral):
'H_0': -3090990.0 ,
'S_0': 132.0 ,
'V_0': 6.264e-05 ,
- 'Cp:' [306.0, -0.003793, -3041700.0, -1852.1] ,
+ 'Cp': [306.0, -0.003793, -3041700.0, -1852.1] ,
'a_0': 2.11e-05 ,
'K_0': 1.059e+11 ,
'Kprime_0': 8.65 ,
@@ -472,7 +472,7 @@ class hen (Mineral):
'H_0': -3082610.0 ,
'S_0': 131.7 ,
'V_0': 6.099e-05 ,
- 'Cp:' [356.2, -0.00299, -596900.0, -3185.3] ,
+ 'Cp': [356.2, -0.00299, -596900.0, -3185.3] ,
'a_0': 2.26e-05 ,
'K_0': 1.5e+11 ,
'Kprime_0': 5.5 ,
@@ -494,7 +494,7 @@ class hfs (Mineral):
'H_0': -2380810.0 ,
'S_0': 189.0 ,
'V_0': 6.405e-05 ,
- 'Cp:' [398.7, -0.006579, 1290100.0, -4058.0] ,
+ 'Cp': [398.7, -0.006579, 1290100.0, -4058.0] ,
'a_0': 2.37e-05 ,
'K_0': 1.5e+11 ,
'Kprime_0': 5.5 ,
@@ -516,7 +516,7 @@ class fs (Mineral):
'H_0': -2388760.0 ,
'S_0': 189.9 ,
'V_0': 6.592e-05 ,
- 'Cp:' [398.7, -0.006579, 1290100.0, -4058.0] ,
+ 'Cp': [398.7, -0.006579, 1290100.0, -4058.0] ,
'a_0': 3.26e-05 ,
'K_0': 1.01e+11 ,
'Kprime_0': 4.08 ,
@@ -538,7 +538,7 @@ class mgts (Mineral):
'H_0': -3196600.0 ,
'S_0': 131.0 ,
'V_0': 6.05e-05 ,
- 'Cp:' [371.4, -0.004082, -398400.0, -3547.1] ,
+ 'Cp': [371.4, -0.004082, -398400.0, -3547.1] ,
'a_0': 2.17e-05 ,
'K_0': 1.028e+11 ,
'Kprime_0': 8.55 ,
@@ -560,7 +560,7 @@ class di (Mineral):
'H_0': -3201820.0 ,
'S_0': 142.9 ,
'V_0': 6.619e-05 ,
- 'Cp:' [314.5, 4.1e-05, -2745900.0, -2020.1] ,
+ 'Cp': [314.5, 4.1e-05, -2745900.0, -2020.1] ,
'a_0': 2.73e-05 ,
'K_0': 1.192e+11 ,
'Kprime_0': 5.19 ,
@@ -582,7 +582,7 @@ class hed (Mineral):
'H_0': -2842120.0 ,
'S_0': 175.0 ,
'V_0': 6.795e-05 ,
- 'Cp:' [340.2, 0.000812, -1047800.0, -2646.7] ,
+ 'Cp': [340.2, 0.000812, -1047800.0, -2646.7] ,
'a_0': 2.38e-05 ,
'K_0': 1.192e+11 ,
'Kprime_0': 3.97 ,
@@ -604,7 +604,7 @@ class jd (Mineral):
'H_0': -3025290.0 ,
'S_0': 133.5 ,
'V_0': 6.04e-05 ,
- 'Cp:' [319.4, 0.003616, -1173900.0, -2469.5] ,
+ 'Cp': [319.4, 0.003616, -1173900.0, -2469.5] ,
'a_0': 2.1e-05 ,
'K_0': 1.281e+11 ,
'Kprime_0': 3.81 ,
@@ -626,7 +626,7 @@ class cats (Mineral):
'H_0': -3310110.0 ,
'S_0': 135.0 ,
'V_0': 6.356e-05 ,
- 'Cp:' [347.6, -0.006974, -1781600.0, -2757.5] ,
+ 'Cp': [347.6, -0.006974, -1781600.0, -2757.5] ,
'a_0': 2.08e-05 ,
'K_0': 1.192e+11 ,
'Kprime_0': 5.19 ,
@@ -648,7 +648,7 @@ class stv (Mineral):
'H_0': -876820.0 ,
'S_0': 24.0 ,
'V_0': 1.401e-05 ,
- 'Cp:' [68.1, 0.00601, -1978200.0, -82.1] ,
+ 'Cp': [68.1, 0.00601, -1978200.0, -82.1] ,
'a_0': 1.58e-05 ,
'K_0': 3.09e+11 ,
'Kprime_0': 4.6 ,
@@ -670,7 +670,7 @@ class macf (Mineral):
'H_0': -2246420.0 ,
'S_0': 80.0 ,
'V_0': 3.614e-05 ,
- 'Cp:' [200.0, 0.006252, -2996400.0, -888.4] ,
+ 'Cp': [200.0, 0.006252, -2996400.0, -888.4] ,
'a_0': 1.93e-05 ,
'K_0': 2.12e+11 ,
'Kprime_0': 4.0 ,
@@ -692,7 +692,7 @@ class mscf (Mineral):
'H_0': -2061130.0 ,
'S_0': 87.5 ,
'V_0': 3.649e-05 ,
- 'Cp:' [213.3, 0.00269, -1410400.0, -1495.9] ,
+ 'Cp': [213.3, 0.00269, -1410400.0, -1495.9] ,
'a_0': 2.01e-05 ,
'K_0': 1.85e+11 ,
'Kprime_0': 4.0 ,
@@ -714,7 +714,7 @@ class fscf (Mineral):
'H_0': -1405500.0 ,
'S_0': 143.4 ,
'V_0': 3.914e-05 ,
- 'Cp:' [181.1, 0.018526, -2767200.0, -527.1] ,
+ 'Cp': [181.1, 0.018526, -2767200.0, -527.1] ,
'a_0': 2.01e-05 ,
'K_0': 1.85e+11 ,
'Kprime_0': 4.0 ,
@@ -736,7 +736,7 @@ class nacf (Mineral):
'H_0': -1965550.0 ,
'S_0': 110.0 ,
'V_0': 3.631e-05 ,
- 'Cp:' [272.7, -0.012398, 0.0, -2763.1] ,
+ 'Cp': [272.7, -0.012398, 0.0, -2763.1] ,
'a_0': 2.1e-05 ,
'K_0': 1.85e+11 ,
'Kprime_0': 4.6 ,
@@ -758,7 +758,7 @@ class cacf (Mineral):
'H_0': -2325600.0 ,
'S_0': 87.6 ,
'V_0': 3.976e-05 ,
- 'Cp:' [191.9, 0.009563, -3211300.0, -640.2] ,
+ 'Cp': [191.9, 0.009563, -3211300.0, -640.2] ,
'a_0': 1.93e-05 ,
'K_0': 1.9e+11 ,
'Kprime_0': 4.0 ,
@@ -780,7 +780,7 @@ class manal (Mineral):
'H_0': -6796630.0 ,
'S_0': 250.0 ,
'V_0': 0.00011166 ,
- 'Cp:' [600.0, 0.018756, -8989200.0, -2665.2] ,
+ 'Cp': [600.0, 0.018756, -8989200.0, -2665.2] ,
'a_0': 1.93e-05 ,
'K_0': 1.84e+11 ,
'Kprime_0': 4.0 ,
@@ -802,7 +802,7 @@ class nanal (Mineral):
'H_0': -6610270.0 ,
'S_0': 280.0 ,
'V_0': 0.00011322 ,
- 'Cp:' [672.7, 0.000106, -5992800.0, -4539.9] ,
+ 'Cp': [672.7, 0.000106, -5992800.0, -4539.9] ,
'a_0': 2.01e-05 ,
'K_0': 1.84e+11 ,
'Kprime_0': 4.0 ,
@@ -824,7 +824,7 @@ class msnal (Mineral):
'H_0': -6172380.0 ,
'S_0': 272.5 ,
'V_0': 0.00011061 ,
- 'Cp:' [639.9, 0.00807, -4231200.0, -4487.7] ,
+ 'Cp': [639.9, 0.00807, -4231200.0, -4487.7] ,
'a_0': 2.1e-05 ,
'K_0': 1.85e+11 ,
'Kprime_0': 4.0 ,
@@ -846,7 +846,7 @@ class fsnal (Mineral):
'H_0': -4146000.0 ,
'S_0': 440.2 ,
'V_0': 0.00011856 ,
- 'Cp:' [543.3, 0.055578, -8301600.0, -1581.3] ,
+ 'Cp': [543.3, 0.055578, -8301600.0, -1581.3] ,
'a_0': 2.1e-05 ,
'K_0': 1.85e+11 ,
'Kprime_0': 4.0 ,
@@ -868,7 +868,7 @@ class canal (Mineral):
'H_0': -6840000.0 ,
'S_0': 257.6 ,
'V_0': 0.00011159 ,
- 'Cp:' [591.9, 0.022067, -9204100.0, -2417.0] ,
+ 'Cp': [591.9, 0.022067, -9204100.0, -2417.0] ,
'a_0': 1.93e-05 ,
'K_0': 1.77e+11 ,
'Kprime_0': 4.0 ,
@@ -890,7 +890,7 @@ class per (Mineral):
'H_0': -601570.0 ,
'S_0': 26.5 ,
'V_0': 1.125e-05 ,
- 'Cp:' [60.5, 0.000362, -535800.0, -299.2] ,
+ 'Cp': [60.5, 0.000362, -535800.0, -299.2] ,
'a_0': 3.11e-05 ,
'K_0': 1.616e+11 ,
'Kprime_0': 3.95 ,
@@ -912,7 +912,7 @@ class fper (Mineral):
'H_0': -262240.0 ,
'S_0': 58.6 ,
'V_0': 1.206e-05 ,
- 'Cp:' [44.4, 0.00828, -1214200.0, 185.2] ,
+ 'Cp': [44.4, 0.00828, -1214200.0, 185.2] ,
'a_0': 3.22e-05 ,
'K_0': 1.52e+11 ,
'Kprime_0': 4.9 ,
@@ -934,7 +934,7 @@ class cor (Mineral):
'H_0': -1675250.0 ,
'S_0': 50.9 ,
'V_0': 2.558e-05 ,
- 'Cp:' [139.5, 0.00589, -2460600.0, -589.2] ,
+ 'Cp': [139.5, 0.00589, -2460600.0, -589.2] ,
'a_0': 1.8e-05 ,
'K_0': 2.54e+11 ,
'Kprime_0': 4.34 ,
@@ -956,7 +956,7 @@ class mcor (Mineral):
'H_0': -1468000.0 ,
'S_0': 59.3 ,
'V_0': 2.635e-05 ,
- 'Cp:' [147.8, 0.002015, -2395000.0, -801.8] ,
+ 'Cp': [147.8, 0.002015, -2395000.0, -801.8] ,
'a_0': 2.12e-05 ,
'K_0': 2.11e+11 ,
'Kprime_0': 4.55 ,
More information about the CIG-COMMITS
mailing list