[cig-commits] [commit] master: update example output (4bc0184)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Jan 14 11:04:12 PST 2015


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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/9422ec507c1a8dfaa6745252962af04a4a149b78...e2bd60d6a01c90c93947fd1c0ed132d06cbadbd2

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

commit 4bc018467f000609f5f1a1ac683ea14d625c5af3
Author: sannecottaar <sanne.cottaar at gmail.com>
Date:   Wed Jan 14 10:42:30 2015 +0000

    update example output


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

4bc018467f000609f5f1a1ac683ea14d625c5af3
 misc/ref/example_averaging.py.out |  4 ++--
 misc/ref/example_woutput.py.out   | 12 ++----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/misc/ref/example_averaging.py.out b/misc/ref/example_averaging.py.out
index 9ff1d6b..a47432f 100644
--- a/misc/ref/example_averaging.py.out
+++ b/misc/ref/example_averaging.py.out
@@ -1,6 +1,6 @@
 Calculations are done for:
 Composite:
   0.6 of
-    'burnman.minerals.SLB_2005.mg_perovskite'
+    'burnman.minerals.SLB_2011.mg_perovskite'
   0.4 of
-    'burnman.minerals.SLB_2005.periclase'
+    'burnman.minerals.SLB_2011.periclase'
diff --git a/misc/ref/example_woutput.py.out b/misc/ref/example_woutput.py.out
index 4b753da..af7ca86 100644
--- a/misc/ref/example_woutput.py.out
+++ b/misc/ref/example_woutput.py.out
@@ -1,16 +1,8 @@
 Calculations are done for:
 Composite:
   0.95 of
-    HelperSolidSolution('burnman.minerals.SLB_2005.mg_fe_perovskite'):
-      0.3 of
-        'burnman.minerals.SLB_2005.mg_perovskite'
-      0.7 of
-        'burnman.minerals.SLB_2005.fe_perovskite'
+    'burnman.minerals.SLB_2011.mg_fe_perovskite'
   0.05 of
-    HelperSolidSolution('burnman.minerals.SLB_2005.ferropericlase'):
-      0.5 of
-        'burnman.minerals.SLB_2005.periclase'
-      0.5 of
-        'burnman.minerals.SLB_2005.wuestite'
+    'burnman.minerals.SLB_2011.ferropericlase'
 
 Your data has been saved as:  example_woutput.txt



More information about the CIG-COMMITS mailing list