[cig-commits] [commit] master: fix test output (557a7cb)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/c5ec36a308413012ee5b0763ccb541c2ad56f382...bc315ff9a2ed1d4871962882f0626468342f1ffc

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

commit 557a7cbc79f4ee4ab24e52f4635e663c2ae53f01
Author: Timo Heister <timo.heister at gmail.com>
Date:   Thu Dec 11 02:18:11 2014 -0500

    fix test output


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

557a7cbc79f4ee4ab24e52f4635e663c2ae53f01
 misc/ref/example_compare_all_methods.py.out | 8 ++++++++
 misc/ref/table.py.out                       | 8 ++++++++
 tests/test_composite.py                     | 2 --
 tests/tests.py                              | 1 -
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/misc/ref/example_compare_all_methods.py.out b/misc/ref/example_compare_all_methods.py.out
index 9980780..2b0d712 100644
--- a/misc/ref/example_compare_all_methods.py.out
+++ b/misc/ref/example_compare_all_methods.py.out
@@ -1,3 +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)
 Calculations are done for:
 Composite:
   0.95 of
diff --git a/misc/ref/table.py.out b/misc/ref/table.py.out
index 898d2dd..f1fc6ba 100644
--- a/misc/ref/table.py.out
+++ b/misc/ref/table.py.out
@@ -1,3 +1,11 @@
+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/tests/test_composite.py b/tests/test_composite.py
index 29da7ba..b2cbab2 100644
--- a/tests/test_composite.py
+++ b/tests/test_composite.py
@@ -21,7 +21,6 @@ class composite(BurnManTest):
         min2 = minerals.SLB_2005.periclase()
 
         c = burnman.Composite( [1.0], [min1] )
-        c.set_method("slb2")
         c.set_state(5e9,300)
         (f,m) = c.unroll()
         mins=",".join([a.to_string() for a in m])
@@ -98,7 +97,6 @@ class composite(BurnManTest):
         min2 = minerals.SLB_2005.periclase()
         ca = burnman.Composite( [1.0], [min1] )
         c = burnman.Composite( [0.4, 0.6], [ca, min2] )
-        c.set_method("slb3")
         c.set_state(5e9,1000)
         (f,m) = c.unroll()
         mins=",".join([a.to_string() for a in m])
diff --git a/tests/tests.py b/tests/tests.py
index d7f1596..b29b566 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -18,7 +18,6 @@ class TestRock(BurnManTest):
         amount_perovskite = 0.3
         rock = burnman.Composite( [amount_perovskite, 1.0-amount_perovskite], \
             [minerals.SLB_2005.mg_fe_perovskite(0.1), minerals.SLB_2005.ferropericlase(0.2)] )
-        rock.set_method('slb2')
         (fr,phases)=rock.unroll()
         self.assertFloatEqual(fr[0], 0.3)
         self.assertFloatEqual(fr[1], 0.7)