[cig-commits] [commit] add_thermodynamic_potentials: Commented ds62 input file (9b4e788)

[cig_noreply at geodynamics.org]

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

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

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

commit 9b4e788a7c14687ad804e11e219f50261389f820
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Sun Aug 31 02:17:38 2014 +0200

    Commented ds62 input file


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

9b4e788a7c14687ad804e11e219f50261389f820
 burnman/minerals/HP_2011_ds62.py | 16 +++++++++++++++-
 burnman/minerals/__init__.py     |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/burnman/minerals/HP_2011_ds62.py b/burnman/minerals/HP_2011_ds62.py
index 0d38efe..273c9dc 100644
--- a/burnman/minerals/HP_2011_ds62.py
+++ b/burnman/minerals/HP_2011_ds62.py
@@ -1,3 +1,17 @@
+# BurnMan - a lower mantle toolkit
+# Copyright (C) 2012-2014, Myhill, R., Heister, T., Unterborn, C., Rose, I. and Cottaar, S.
+# Released under GPL v2 or later.
+
+"""
+
+HP_2011_ds62
+^^^^^^^^
+
+Minerals from Holland and Powell (2011) and references therein
+Update to dataset version 6.2
+
+"""
+
 from burnman.processchemistry import ProcessChemistry
 from burnman.mineral import Mineral
 from burnman.solidsolution import SolidSolution
@@ -6,7 +20,7 @@ from burnman.solidsolution import SolidSolution
 class garnet(SolidSolution):
     def __init__(self):
         # Endmembers
-        base_material = [[py(),  '[Mg]3[Al]2Si3O12',         1.0], [alm(), '[Fe]3[Al]2Si3O12',         1.0], [gr(),  '[Ca]3[Al]2Si3O12',         2.7], [maj(), '[Mg]3[Mg1/2Si1/2]2Si3O12', 1.0]]
+        base_material = [[py(), '[Mg]3[Al]2Si3O12', 1.0],[alm(), '[Fe]3[Al]2Si3O12', 1.0],[gr(), '[Ca]3[Al]2Si3O12', 2.7],[maj(), '[Mg]3[Mg1/2Si1/2]2Si3O12', 1.0]]
 
         # Interaction parameters
         excess_enthalpy=[[2.5e3, 29.1e3, 15e3],[10e3,18e3],[48e3]]
diff --git a/burnman/minerals/__init__.py b/burnman/minerals/__init__.py
index 2420862..de01dcd 100644
--- a/burnman/minerals/__init__.py
+++ b/burnman/minerals/__init__.py
@@ -1,5 +1,5 @@
 # BurnMan - a lower mantle toolkit
-# Copyright (C) 2012, 2013, Heister, T., Unterborn, C., Rose, I. and Cottaar, S.
+# Copyright (C) 2012-2014, Myhill, R., Heister, T., Unterborn, C., Rose, I. and Cottaar, S.
 # Released under GPL v2 or later.
 
 """