[cig-commits] [commit] add_thermodynamic_potentials: Removed superseded SLB_2011_working.py (db2891a)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Tue Dec 9 09:55:15 PST 2014


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

On branch  : add_thermodynamic_potentials
Link       : https://github.com/geodynamics/burnman/compare/2e5646d93cedbbf8eae54cc37cffc14e0aa85180...d5ddad03ff9f30f5a4efaddb4e3ec585ea1a7c51

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

commit db2891a3d9eb66d0f1ddb39459b4ec7737fc286a
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Sun Aug 31 02:11:07 2014 +0200

    Removed superseded SLB_2011_working.py


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

db2891a3d9eb66d0f1ddb39459b4ec7737fc286a
 burnman/minerals/SLB_2011_working.py | 214 -----------------------------------
 1 file changed, 214 deletions(-)

diff --git a/burnman/minerals/SLB_2011_working.py b/burnman/minerals/SLB_2011_working.py
deleted file mode 100644
index d0f9911..0000000
--- a/burnman/minerals/SLB_2011_working.py
+++ /dev/null
@@ -1,214 +0,0 @@
-# BurnMan - a lower mantle toolkit
-# Copyright (C) 2012, 2013, Heister, T., Unterborn, C., Rose, I. and Cottaar, S.
-# Released under GPL v2 or later.
-
-"""
-
-SLB_2011
-^^^^^^^^
-
-Minerals from Stixrude & Lithgow-Bertelloni 2011 and references therein
-
-"""
-
-import burnman.mineral_helpers as bmb
-from burnman.mineral import Mineral
-from burnman.solidsolution import SolidSolution
-
-class stishovite (Mineral):
-    """
-    Stixrude & Lithgow-Bertelloni 2011 and references therein
-    """
-    def __init__(self):
-        self.params = {
-            'equation_of_state': 'slb3',
-            'V_0': 14.02e-6,
-            'K_0': 314.0e9,
-            'Kprime_0': 3.8,
-            'G_0': 220.0e9,
-            'Gprime_0': 1.9,
-            'molar_mass': .0601,
-            'n': 3,
-            'Debye_0': 1108.,
-            'grueneisen_0': 1.37,
-            'q_0': 2.8,
-            'eta_s_0': 4.6}
-
-        self.uncertainties = {
-             'err_K_0':8.e9,
-             'err_Kprime_0':0.1,
-             'err_G_0':12.e9,
-             'err_Gprime_0':0.1,
-             'err_Debye_0' : 13.,
-             'err_grueneisen_0': .17,
-             'err_q_0': 2.2,
-             'err_eta_s_0' : 1.0
-            }
-
-
-class periclase (Mineral):
-    """
-    Stixrude & Lithgow-Bertelloni 2011 and references therein
-    """
-    def __init__(self):
-        self.params = {
-            'equation_of_state':'slb3',
-            'V_0': 11.24e-6,
-            'K_0': 161.0e9,
-            'Kprime_0': 3.8,
-            'G_0': 131.0e9,
-            'Gprime_0': 2.1,
-            'molar_mass': .0403,
-            'n': 2,
-            'Debye_0': 767.,
-            'grueneisen_0': 1.36,
-            'q_0': 1.7, #1.7
-            'eta_s_0': 2.8 } # 2.8
-
-        self.uncertainties = {
-        'err_K_0': 3.e9,
-        'err_Kprime_0':.2,
-        'err_G_0':1.0e9,
-        'err_Gprime_0':.1,
-        'err_Debye_0':9.,
-        'err_grueneisen_0':.05,
-        'err_q_0':.2,
-        'err_eta_s_0':.2 }
-
-class wuestite (Mineral):
-    """
-    Stixrude & Lithgow-Bertelloni 2011 and references therein
-    """
-    def __init__(self):
-        self.params = {
-            'equation_of_state':'slb3',
-            'V_0': 12.26e-6,
-            'K_0': 179.0e9,
-            'Kprime_0': 4.9,
-            'G_0': 59.0e9,
-            'Gprime_0': 1.4,
-            'molar_mass': .0718,
-            'n': 2,
-            'Debye_0': 454.,
-            'grueneisen_0': 1.53,
-            'q_0': 1.7, #1.7
-            'eta_s_0': -0.1 } #
-
-        self.uncertainties = {
-            'err_K_0':1.e9,
-            'err_Kprime_0':.2,
-            'err_G_0':1.e9,
-            'err_Gprime_0':.1,
-            'err_Debye_0':21.,
-            'err_grueneisen_0':.13,
-            'err_q_0':1.0,
-            'err_eta_s_0':1.0}
-
-# Stixrude and Lithgow-Bertelloni, 2011
-class ferropericlase(SolidSolution):
-    def __init__(self):
-        base_material = [[periclase(), '[Mg]O',       1.0], /
-                         wuestite(),   '[Fe]O',       1.0], /
-        
-        # Interaction parameters
-        excess_enthalpy=[[13e3]]
-        excess_entropy=[[0.]]
-        excess_volume=[[0.]]
-
-        interaction_parameter=[excess_enthalpy,excess_entropy,excess_volume]
-        SolidSolution.__init__(self, base_material, interaction_parameter)
-
-# Stixrude and Lithgow-Bertelloni, 2011
-class mg_fe_perovskite(SolidSolution):
-    def __init__(self):
-        base_materials = [[mg_perovskite(), '[Mg]SiO3', 1.0], /
-                          fe_perovskite(),  '[Fe]SiO3', 1.0]]
-        # Interaction parameters
-        excess_enthalpy=[[0e3]]
-        excess_entropy=[[0.]]
-        excess_volume=[[0.]]
-
-        interaction_parameter=[excess_enthalpy,excess_entropy,excess_volume]
-        SolidSolution.__init__(self, base_material, interaction_parameter)
-
-# Mixed Holland and Powell sources (test only)
-class garnet(SolidSolution):
-    def __init__(self):
-        # Endmembers
-        base_material = [[pyrope(),    '[Mg]3[Al]2Si3O12',         1.0], /
-                         [almandine(), '[Fe]3[Al]2Si3O12',         1.0], /
-                         [grossular(), '[Ca]3[Al]2Si3O12',         2.7], /
-                         [majorite(),  '[Mg]3[Mg1/2Si1/2]2Si3O12', 1.0]]
-
-        # Interaction parameters
-        excess_enthalpy=[[2.5e3, 29.1e3, 15e3][10e3,18e3][48e3]]
-        excess_entropy=[[0., 0., 0.][0., 0.][0.]]
-        excess_volume=[[0., 0., 0.][0., 0.][0.]]
-        
-        interaction_parameter=[excess_enthalpy,excess_entropy,excess_volume]
-        SolidSolution.__init__(self, base_material, interaction_parameter)
-
-
-class mg_perovskite(Mineral):
-    """
-    Stixrude & Lithgow-Bertelloni 2011 and references therein
-    """
-    def __init__(self):
-        self.params = {
-            'equation_of_state':'slb3',
-            'V_0': 24.45e-6,
-            'K_0': 251.0e9,
-            'Kprime_0': 4.1,
-            'G_0': 173.0e9,
-            'Gprime_0': 1.7,
-            'molar_mass': .1000,
-            'n': 5,
-            'Debye_0': 905.,
-            'grueneisen_0': 1.57,
-            'q_0': 1.1,
-            'eta_s_0': 2.6 } #2.6
-
-        self.uncertainties = {
-            'err_K_0': 3.e9,
-            'err_Kprime_0': 0.1,
-            'err_G_0': 2.e9,
-            'err_Gprime_0' : 0.0,
-            'err_Debye_0': 5.,
-            'err_grueneisen_0':.05,
-            'err_q_0': .3,
-            'err_eta_s_0':.3}
-
-
-class fe_perovskite(Mineral):
-    """
-    Stixrude & Lithgow-Bertelloni 2011 and references therein
-    """
-    def __init__(self):
-        self.params = {
-            'equation_of_state':'slb3',
-            'V_0': 25.49e-6,
-            'K_0': 272.0e9,
-            'Kprime_0': 4.1,
-            'G_0': 133.0e9,
-            'Gprime_0': 1.4,
-            'molar_mass': .1319,
-            'n': 5,
-            'Debye_0': 871.,
-            'grueneisen_0': 1.57,
-            'q_0': 1.1,
-            'eta_s_0': 2.3 } #2.3
-
-        self.uncertainties = {
-            'err_K_0':40e9,
-            'err_Kprime_0':1.,
-            'err_G_0':40e9,
-            'err_Gprime_0':0.0,
-            'err_Debye_0':26.,
-            'err_grueneisen_0':.3,
-            'err_q_0':1.0,
-            'err_eta_s_0':1.0}
-
-mg_bridgmanite = mg_perovskite
-fe_bridgmanite = fe_perovskite
-mg_fe_bridgmanite = mg_fe_perovskite
-mg_fe_bridgmanite_pt_dependent = mg_fe_perovskite_pt_dependent



More information about the CIG-COMMITS mailing list