[cig-commits] [commit] master: Add G to comparison arrays. Not a great test, as this is zero for MTait, but at least checks it is set... (ca4a16a)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Mon Dec 29 16:31:53 PST 2014


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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/79ecc7fdbc1d15104c8d2d8ff5389e424714175f...911aa89d9079e32f4cee0d042a9ab7ec493c74c1

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

commit ca4a16adaeda4327fcd5f71a5911d88e678874a4
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Tue Dec 16 20:59:24 2014 -0800

    Add G to comparison arrays. Not a great test, as this is zero for MTait, but at least checks it is set...


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

ca4a16adaeda4327fcd5f71a5911d88e678874a4
 tests/test_solidsolution.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test_solidsolution.py b/tests/test_solidsolution.py
index 5580489..f136c50 100644
--- a/tests/test_solidsolution.py
+++ b/tests/test_solidsolution.py
@@ -158,14 +158,14 @@ class test_solidsolution(BurnManTest):
 
     def test_1_gibbs(self):
         fo, fo_ss = self.setup_1min_ss()
-        endmember_properties=[fo.gibbs, fo.H, fo.S, fo.V, fo.C_p, fo.C_v, fo.alpha, fo.K_T, fo.K_S, fo.gr]
-        ss_properties=[fo_ss.gibbs, fo_ss.H, fo_ss.S, fo_ss.V, fo_ss.C_p, fo_ss.C_v, fo_ss.alpha, fo_ss.K_T, fo_ss.K_S, fo_ss.gr]
+        endmember_properties=[fo.gibbs, fo.H, fo.S, fo.V, fo.C_p, fo.C_v, fo.alpha, fo.K_T, fo.K_S, fo.gr, fo.G]
+        ss_properties=[fo_ss.gibbs, fo_ss.H, fo_ss.S, fo_ss.V, fo_ss.C_p, fo_ss.C_v, fo_ss.alpha, fo_ss.K_T, fo_ss.K_S, fo_ss.gr, fo_ss.G]
         self.assertArraysAlmostEqual(endmember_properties, ss_properties)
 
     def test_2_gibbs(self):
         fo, fo_ss = self.setup_2min_ss()
-        endmember_properties=[fo.gibbs, fo.H, fo.S, fo.V, fo.C_p, fo.C_v, fo.alpha, fo.K_T, fo.K_S, fo.gr]
-        ss_properties=[fo_ss.gibbs, fo_ss.H, fo_ss.S, fo_ss.V, fo_ss.C_p, fo_ss.C_v, fo_ss.alpha, fo_ss.K_T, fo_ss.K_S, fo_ss.gr]
+        endmember_properties=[fo.gibbs, fo.H, fo.S, fo.V, fo.C_p, fo.C_v, fo.alpha, fo.K_T, fo.K_S, fo.gr, fo.G]
+        ss_properties=[fo_ss.gibbs, fo_ss.H, fo_ss.S, fo_ss.V, fo_ss.C_p, fo_ss.C_v, fo_ss.alpha, fo_ss.K_T, fo_ss.K_S, fo_ss.gr, fo_ss.G]
         self.assertArraysAlmostEqual(endmember_properties, ss_properties)
 
     def test_ol_gibbs(self):



More information about the CIG-COMMITS mailing list