[cig-commits] [commit] master: Change to a more reasonable mineralogy. (6469986)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Tue Jan 13 18:02:52 PST 2015


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

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

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

commit 6469986c9275d3005000ae3514b0d22489a28038
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Mon Jan 12 20:58:20 2015 -0800

    Change to a more reasonable mineralogy.


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

6469986c9275d3005000ae3514b0d22489a28038
 examples/example_build_planet.py        |   8 ++++----
 sphinx/figures/example_build_planet.png | Bin 65661 -> 66303 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/example_build_planet.py b/examples/example_build_planet.py
index de1adb4..907a589 100644
--- a/examples/example_build_planet.py
+++ b/examples/example_build_planet.py
@@ -95,10 +95,10 @@ if __name__ == "__main__":
 
             #The planet will be represented by a two layer model, mantle and core.  
             #The top layer will be a composite of 80% perovskite and 20% periclase.
-            amount_perovskite = 0.8
-            self.mantle = burnman.Composite( [amount_perovskite, 1.0-amount_perovskite],
-                                             [minerals.SLB_2011.mg_perovskite(),
-                                              minerals.SLB_2011.periclase()] )
+            amount_olivine = 0.8
+            self.mantle = burnman.Composite( [amount_olivine, 1.0-amount_olivine],
+                                             [minerals.SLB_2011.forsterite(),
+                                              minerals.SLB_2011.enstatite()] )
              #The core will be represented by solid iron.
             self.core = iron() 
 
diff --git a/sphinx/figures/example_build_planet.png b/sphinx/figures/example_build_planet.png
index dec99d4..000f865 100644
Binary files a/sphinx/figures/example_build_planet.png and b/sphinx/figures/example_build_planet.png differ



More information about the CIG-COMMITS mailing list