[cig-commits] [commit] add_thermodynamic_potentials: Temporary fix until ProcessSolidSolutionChemistry is fixed (d3bdf15)

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


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

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

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

commit d3bdf15e5bd4cab84bd2ecd1066d7f7e1e120142
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Tue Sep 2 19:51:16 2014 -0700

    Temporary fix until ProcessSolidSolutionChemistry is fixed


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

d3bdf15e5bd4cab84bd2ecd1066d7f7e1e120142
 solidsolution_benchmarks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solidsolution_benchmarks.py b/solidsolution_benchmarks.py
index 62538e4..915435f 100644
--- a/solidsolution_benchmarks.py
+++ b/solidsolution_benchmarks.py
@@ -79,7 +79,7 @@ class orthopyroxene_a(burnman.SolidSolution):
         self.name='orthopyroxene'
 
         # Endmembers (cpx is symmetric)
-        base_material = [[enstatite(), '[Mg][Mg][Si]SiO6'],[mg_tschermaks_molecule(), '[Mg][Al][Al]SiO6'] ]
+        base_material = [[enstatite(), '[Mg][Mg][Si]Si1O6'],[mg_tschermaks_molecule(), '[Mg][Al][Al]Si1O6'] ]
 
         # Interaction parameters
         enthalpy_interaction=[[0.0]]
@@ -92,7 +92,7 @@ class orthopyroxene_b(burnman.SolidSolution):
         self.name='orthopyroxene'
 
         # Endmembers (cpx is symmetric)
-        base_material = [[enstatite(), '[Mg][Mg]Si2O6'],[mg_tschermaks_molecule(), '[Mg][Al]AlSiO6'] ]
+        base_material = [[enstatite(), '[Mg][Mg]Si2O6'],[mg_tschermaks_molecule(), '[Mg][Al]Al1Si1O6'] ]
 
         # Interaction parameters
         enthalpy_interaction=[[0.0]]



More information about the CIG-COMMITS mailing list