[cig-commits] [commit] inversion, master, validate_MT_params: re-add old ferropericlase (9cbd2a2)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Dec 12 18:28:14 PST 2014
Repository : https://github.com/geodynamics/burnman
On branches: inversion,master,validate_MT_params
Link : https://github.com/geodynamics/burnman/compare/80c2a295c42dfdb38f83f6c1334bf7d8f97a8463...409647ff05dfad6a686198cac1481bd46b5e2e62
>---------------------------------------------------------------
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):
More information about the CIG-COMMITS
mailing list