[cig-commits] [commit] master: re-add old ferropericlase (9cbd2a2)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/53964ef9adcc1f8b89f9e48ae774c2ecb51f216a...6f75d3766c3c8e3bf6599b894e7bbe2993f57419

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

commit 9cbd2a2372f3523f642485fd4d6e844438928eb8
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Dec 12 13:48:15 2014 -0800

    re-add old ferropericlase


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

9cbd2a2372f3523f642485fd4d6e844438928eb8
 burnman/minerals/other.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/burnman/minerals/other.py b/burnman/minerals/other.py
index c699120..a4d5f89 100644
--- a/burnman/minerals/other.py
+++ b/burnman/minerals/other.py
@@ -11,6 +11,15 @@ Other minerals
 import burnman.mineral_helpers as bmb
 from burnman.mineral import Mineral
 
+from SLB_2011 import periclase, wuestite
+
+
+class ferropericlase(bmb.HelperSolidSolution):
+    def __init__(self, fe_num):
+        base_materials = [periclase(), wuestite()]
+        molar_fraction = [1. - fe_num, 0.0 + fe_num] # keep the 0.0 +, otherwise it is an array sometimes
+        bmb.HelperSolidSolution.__init__(self, base_materials, molar_fraction)
+
 
 class Speziale_fe_periclase(bmb.HelperSpinTransition):
     def __init__(self):