[cig-commits] [commit] inversion,master: add minerals (35b1865)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Dec 12 18:41:36 PST 2014
Repository : https://github.com/geodynamics/burnman
On branches: inversion,master
Link : https://github.com/geodynamics/burnman/compare/fbb6b61f7364ae7c3d8592183d8acd4201344e50...dbe5744373435883ad2d29889becd9e4be56b1bd
>---------------------------------------------------------------
commit 35b1865580879b6cce98e3f3e48b811876a2d5cd
Author: sannecottaar <sanne.cottaar at gmail.com>
Date: Fri Dec 12 18:12:29 2014 -0800
add minerals
>---------------------------------------------------------------
35b1865580879b6cce98e3f3e48b811876a2d5cd
burnman/minerals/other.py | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/burnman/minerals/other.py b/burnman/minerals/other.py
index 48fce46..3dd3c5f 100644
--- a/burnman/minerals/other.py
+++ b/burnman/minerals/other.py
@@ -11,7 +11,7 @@ Other minerals
import burnman.mineral_helpers as bmb
from burnman.mineral import Mineral
-from SLB_2011 import periclase, wuestite
+from SLB_2011 import periclase, wuestite, mg_perovskite, fe_perovskite
# This is ferropericlase with the depricated solid solution setup, although it is still used in some of the /misc/paper* scripts
class ferropericlase(bmb.HelperSolidSolution):
@@ -20,15 +20,21 @@ class ferropericlase(bmb.HelperSolidSolution):
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)
-# similar to ferropericlase, using the old solid solution setup. These values are based on Zhang, Stixrude and Brodholt 2013
-class ZSB_2013_mg_fe_perovskite(bmb.HelperSolidSolution):
+# this is mg_fe_perovskite iwth the depricated solid solution setup. Better not use...
+class mg_fe_perovskite(bmb.HelperSolidSolution):
def __init__(self, fe_num):
base_materials = [mg_perovskite(), fe_perovskite()]
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)
+# similar to ferropericlase, using the old solid solution setup. These values are based on Zhang, Stixrude and Brodholt 2013
+class ZSB_2013_mg_fe_perovskite(bmb.HelperSolidSolution):
+ def __init__(self, fe_num):
+ base_materials = [ZSB_2013_mg_perovskite(), ZSB_2013_fe_perovskite()]
+ 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 mg_perovskite(Mineral):
+class ZSB_2013_mg_perovskite(Mineral):
def __init__(self):
self.params = {
'equation_of_state':'slb3',
@@ -56,7 +62,7 @@ class mg_perovskite(Mineral):
Mineral.__init__(self)
-class fe_perovskite(Mineral):
+class ZSB_2013_fe_perovskite(Mineral):
def __init__(self):
self.params = {
'equation_of_state':'slb3',
@@ -84,6 +90,7 @@ class fe_perovskite(Mineral):
Mineral.__init__(self)
+
class Speziale_fe_periclase(bmb.HelperSpinTransition):
def __init__(self):
bmb.HelperSpinTransition.__init__(self, 60.0e9, Speziale_fe_periclase_LS(), Speziale_fe_periclase_HS())
More information about the CIG-COMMITS
mailing list