[cig-commits] [commit] master: Fix tests (5ab517f)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Dec 12 16:37:35 PST 2014
Repository : https://github.com/geodynamics/burnman
On branch : master
Link : https://github.com/geodynamics/burnman/compare/916ee6acd98bd253c534a4b858b8d86ec62c3fd5...5e9eb1c42d6dd00a30a59872a2b31d1c0f8bd09c
>---------------------------------------------------------------
commit 5ab517fcd3e2b6d5f42722a47d80509fc197b871
Author: ian-r-rose <ian.r.rose at gmail.com>
Date: Fri Dec 12 16:16:21 2014 -0800
Fix tests
>---------------------------------------------------------------
5ab517fcd3e2b6d5f42722a47d80509fc197b871
misc/benchmarks/benchmark.py | 7 ++-----
misc/ref/example_spintransition.py.out | 4 ----
misc/ref/table.py.out | 8 ++------
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/misc/benchmarks/benchmark.py b/misc/benchmarks/benchmark.py
index e39ce27..12b28c2 100644
--- a/misc/benchmarks/benchmark.py
+++ b/misc/benchmarks/benchmark.py
@@ -30,11 +30,8 @@ def check_birch_murnaghan():
'G_0': 175.0e9,
'Gprime_0': 1.7,
'molar_mass': .0,
- 'n': 0.,
- 'Debye_0': 0.,
- 'grueneisen_0': 0.,
- 'q_0': 0.}
- test_mineral.set_method('mgd3')
+ }
+ test_mineral.set_method('bm3')
pressure = np.linspace(0., 140.e9, 100)
volume = np.empty_like(pressure)
diff --git a/misc/ref/example_spintransition.py.out b/misc/ref/example_spintransition.py.out
index fdfc38a..8df1dae 100644
--- a/misc/ref/example_spintransition.py.out
+++ b/misc/ref/example_spintransition.py.out
@@ -1,7 +1,3 @@
-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'
- warnings.warn(('Warning: G_0 and or Gprime_0 are undefined for ' + self.to_string()))
Calculations are done for:
HelperSpinTransition:
'burnman.minerals.Murakami_etal_2012.fe_periclase_LS'
diff --git a/misc/ref/table.py.out b/misc/ref/table.py.out
index dbc5c3c..26c0b21 100644
--- a/misc/ref/table.py.out
+++ b/misc/ref/table.py.out
@@ -1,7 +1,3 @@
-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'
- warnings.warn(('Warning: G_0 and or Gprime_0 are undefined for ' + self.to_string()))
Could not create 'Murakami_2013.ferropericlase'
Could not create 'Murakami_2013.mg_fe_bridgmanite'
Could not create 'Murakami_2013.mg_fe_perovskite'
@@ -397,7 +393,7 @@ SLB_2011_ZSB_2013.mg_perovskite
SLB_2011_ZSB_2013.periclase 1.124e-05 1.61e+11 3.8 1.31e+11 2.1 0.0403 2 767.0 1.36 1.7 2.8
SLB_2011_ZSB_2013.stishovite 1.402e-05 3.14e+11 3.8 2.2e+11 1.9 0.0601 3 1108.0 1.37 2.8 4.6
SLB_2011_ZSB_2013.wuestite 1.226e-05 1.79e+11 4.9 59000000000.0 1.4 0.0718 2 454.0 1.53 1.7 -0.1
-other.Speziale_fe_periclase_HS 2.29e-05 1.575e+11 3.92 0.04567 2 587 1.46 1.2
-other.Speziale_fe_periclase_LS 2.149e-05 1.86e+11 4.6 0.04567 2 587.0 1.46 1.2
+other.Speziale_fe_periclase_HS 2.29e-05 1.575e+11 3.92 nan nan 0.04567 2 587 1.46 1.2
+other.Speziale_fe_periclase_LS 2.149e-05 1.86e+11 4.6 nan nan 0.04567 2 587.0 1.46 1.2
other.periclase (SLB_2011.periclase) 1.124e-05 1.61e+11 3.8 1.31e+11 2.1 0.0403044 2.0 767.0 1.36 1.7 2.8
other.wuestite (SLB_2011.wuestite) 1.226e-05 1.79e+11 4.9 59000000000.0 1.4 0.0718444 2.0 454.0 1.53 1.7 -0.1
More information about the CIG-COMMITS
mailing list