[cig-commits] [commit] master: fix examples and tests (a2a6310)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Dec 11 12:20:24 PST 2014
Repository : https://github.com/geodynamics/burnman
On branch : master
Link : https://github.com/geodynamics/burnman/compare/c5ec36a308413012ee5b0763ccb541c2ad56f382...bc315ff9a2ed1d4871962882f0626468342f1ffc
>---------------------------------------------------------------
commit a2a63105b42028b31c639fe1344137c56b25faaa
Author: Timo Heister <timo.heister at gmail.com>
Date: Thu Dec 11 12:11:34 2014 -0800
fix examples and tests
>---------------------------------------------------------------
a2a63105b42028b31c639fe1344137c56b25faaa
misc/paper_uncertain.py | 1 +
misc/paper_uncertainty.py | 2 ++
misc/ref/example_compare_all_methods.py.out | 16 ++++++++--------
misc/ref/example_fit_data.py.out | 2 ++
misc/ref/paper_fit_data.py.out | 2 ++
misc/ref/table.py.out | 8 --------
misc/table.py | 2 --
tests/benchmark.py | 1 +
tests/test_model.py | 1 +
tests/test_vrh.py | 1 +
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/misc/paper_uncertain.py b/misc/paper_uncertain.py
index b043a4c..58fd033 100644
--- a/misc/paper_uncertain.py
+++ b/misc/paper_uncertain.py
@@ -38,6 +38,7 @@ class my_perovskite(burnman.Mineral):
'grueneisen_0': 1.57 * uncertain[5],
'q_0': 1.1 * uncertain[6],
'eta_s_0': 2.6 * uncertain[7]}
+ burnman.Mineral.__init__(self)
if __name__ == "__main__":
figure=plt.figure(dpi=100,figsize=(12,10))
diff --git a/misc/paper_uncertainty.py b/misc/paper_uncertainty.py
index 3709d0a..b6b37f3 100644
--- a/misc/paper_uncertainty.py
+++ b/misc/paper_uncertainty.py
@@ -33,6 +33,8 @@ class my_perovskite(burnman.Mineral):
'grueneisen_0': 1.57 * uncertain[5],
'q_0': 1.1 * uncertain[6],
'eta_s_0': 2.6 * uncertain[7]}
+ burnman.Mineral.__init__(self)
+
if __name__ == "__main__":
figure=plt.figure(dpi=100,figsize=(12,10))
diff --git a/misc/ref/example_compare_all_methods.py.out b/misc/ref/example_compare_all_methods.py.out
index 2b0d712..607b256 100644
--- a/misc/ref/example_compare_all_methods.py.out
+++ b/misc/ref/example_compare_all_methods.py.out
@@ -1,11 +1,11 @@
-BURNMAN/burnman/mineral.py: UserWarning: Overriding database equation of state. From slb2 to mgd3
- warnings.warn('Overriding database equation of state. From '+self.params['equation_of_state'] +' to ' + method)
-BURNMAN/burnman/mineral.py: UserWarning: Overriding database equation of state. From slb2 to slb3
- warnings.warn('Overriding database equation of state. From '+self.params['equation_of_state'] +' to ' + method)
-BURNMAN/burnman/mineral.py: UserWarning: Overriding database equation of state. From slb2 to bm2
- warnings.warn('Overriding database equation of state. From '+self.params['equation_of_state'] +' to ' + method)
-BURNMAN/burnman/mineral.py: UserWarning: Overriding database equation of state. From slb2 to bm3
- warnings.warn('Overriding database equation of state. From '+self.params['equation_of_state'] +' to ' + method)
+BURNMAN/burnman/composite.py: UserWarning: Overriding database equation of state. From SLB2 to MGD3
+ phase.set_method(method)
+BURNMAN/burnman/composite.py: UserWarning: Overriding database equation of state. From SLB2 to SLB3
+ phase.set_method(method)
+BURNMAN/burnman/composite.py: UserWarning: Overriding database equation of state. From SLB2 to BM2
+ phase.set_method(method)
+BURNMAN/burnman/composite.py: UserWarning: Overriding database equation of state. From SLB2 to BM3
+ phase.set_method(method)
Calculations are done for:
Composite:
0.95 of
diff --git a/misc/ref/example_fit_data.py.out b/misc/ref/example_fit_data.py.out
index 434e342..e03a3f4 100644
--- a/misc/ref/example_fit_data.py.out
+++ b/misc/ref/example_fit_data.py.out
@@ -1,3 +1,5 @@
+<stdin>:76: UserWarning: Overriding database equation of state. From BM2 to BM3
+<stdin>:85: UserWarning: Overriding database equation of state. From BM3 to BM2
Optimization terminated successfully.
Current function value: 14212.177931
Iterations: 109
diff --git a/misc/ref/paper_fit_data.py.out b/misc/ref/paper_fit_data.py.out
index 3ecb952..b352cfb 100644
--- a/misc/ref/paper_fit_data.py.out
+++ b/misc/ref/paper_fit_data.py.out
@@ -1,3 +1,5 @@
+<stdin>:88: UserWarning: Overriding database equation of state. From BM2 to BM3
+<stdin>:97: UserWarning: Overriding database equation of state. From BM3 to BM2
(prop.get_family(), self.defaultFamily[fontext]))
UserWarning)
Optimization terminated successfully.
diff --git a/misc/ref/table.py.out b/misc/ref/table.py.out
index f1fc6ba..898d2dd 100644
--- a/misc/ref/table.py.out
+++ b/misc/ref/table.py.out
@@ -1,11 +1,3 @@
-BURNMAN/burnman/mineral.py: UserWarning: Overriding database equation of state. From mgd2 to bm3
- warnings.warn('Overriding database equation of state. From '+self.params['equation_of_state'] +' to ' + method)
-BURNMAN/burnman/mineral.py: UserWarning: Overriding database equation of state. From slb2 to bm3
- warnings.warn('Overriding database equation of state. From '+self.params['equation_of_state'] +' to ' + method)
-BURNMAN/burnman/mineral.py: UserWarning: Overriding database equation of state. From slb3 to bm3
- warnings.warn('Overriding database equation of state. From '+self.params['equation_of_state'] +' to ' + method)
-BURNMAN/burnman/mineral.py: UserWarning: Overriding database equation of state. From mgd3 to bm3
- warnings.warn('Overriding database equation of state. From '+self.params['equation_of_state'] +' to ' + method)
BURNMAN/burnman/mineral.py: UserWarning: Warning: G_0 and or Gprime_0 are undefined for 'burnman.minerals.other.Speziale_fe_periclase_HS'
warnings.warn(('Warning: G_0 and or Gprime_0 are undefined for ' + self.to_string()))
BURNMAN/burnman/mineral.py: UserWarning: Warning: G_0 and or Gprime_0 are undefined for 'burnman.minerals.other.Speziale_fe_periclase_LS'
diff --git a/misc/table.py b/misc/table.py
index 6db86a8..f68767a 100644
--- a/misc/table.py
+++ b/misc/table.py
@@ -64,8 +64,6 @@ if __name__ == "__main__":
sortedlist = sorted(phasenames, key=lambda x: x[0])
for (name,p) in sortedlist:
- #print p.to_string()
- p.set_method('bm3')
p.set_state(1e9,300)
row = create_list(name,p)
table.append(row)
diff --git a/tests/benchmark.py b/tests/benchmark.py
index 60b314e..d41420f 100644
--- a/tests/benchmark.py
+++ b/tests/benchmark.py
@@ -34,6 +34,7 @@ def check_birch_murnaghan():
'Debye_0': 0.,
'grueneisen_0': 0.,
'q_0': 0.}
+ test_mineral.set_method('mgd3')
pressure = np.linspace(0., 140.e9, 100)
volume = np.empty_like(pressure)
diff --git a/tests/test_model.py b/tests/test_model.py
index 5ebfef3..60fd977 100644
--- a/tests/test_model.py
+++ b/tests/test_model.py
@@ -22,6 +22,7 @@ class min1 (burnman.Mineral):
'grueneisen_0': 1.5,
'q_0': 1.5,
'eta_s_0': 2.8 }
+ burnman.Mineral.__init__(self)
class min2 (min1):
diff --git a/tests/test_vrh.py b/tests/test_vrh.py
index 684e345..185e727 100644
--- a/tests/test_vrh.py
+++ b/tests/test_vrh.py
@@ -25,6 +25,7 @@ class mypericlase (burnman.Mineral):
'grueneisen_0': 1.5,
'q_0': 1.5,
'eta_s_0': 2.8 }
+ burnman.Mineral.__init__(self)
class VRH_average(BurnManTest):
def test_one_object(self):
More information about the CIG-COMMITS
mailing list