[cig-commits] [commit] add_thermodynamic_potentials: Merged SLB_2011.py with solid-solution-bearing file (0fa8e10)

[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 0fa8e1074fadfcc16aaceeaf8c4b31893a6f1431
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Thu Sep 4 02:22:02 2014 +0200

    Merged SLB_2011.py with solid-solution-bearing file


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

0fa8e1074fadfcc16aaceeaf8c4b31893a6f1431
 burnman/minerals/SLB_2011.py                   | 1996 ++++++++++++++++++++++--
 burnman/minerals/SLB_2011_w_solid_solutions.py | 1871 ----------------------
 2 files changed, 1840 insertions(+), 2027 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 0fa8e1074fadfcc16aaceeaf8c4b31893a6f1431