[cig-commits] [commit] add_thermodynamic_potentials: Merge branch 'add_thermodynamic_potentials' of https://github.com/geodynamics/burnman into add_thermodynamic_potentials (9a22a80)

[cig_noreply at geodynamics.org]

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

On branch  : add_thermodynamic_potentials
Link       : https://github.com/geodynamics/burnman/compare/d52a15cda6a0bbf70dcf7a9a6fc6ecd733956739...16364559f0c2bd31629704786bfc9fb47bd7eb7d

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

commit 9a22a80d721fd363d062558932cd6808a935eeb0
Merge: ba0b61a 86bc2e5
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Wed Dec 10 14:49:25 2014 -0800

    Merge branch 'add_thermodynamic_potentials' of https://github.com/geodynamics/burnman into add_thermodynamic_potentials



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

9a22a80d721fd363d062558932cd6808a935eeb0
 burnman/equilibriumassemblage.py | 83 ++++++++++++++++++++++++++-----------
 burnman/solidsolution.py         | 10 ++---
 burnman/solutionmodel.py         | 89 ++++++++++++++++++++++------------------
 olivine_wadsleyite.py            | 10 +++--
 solidsolution_benchmarks.py      |  4 +-
 5 files changed, 122 insertions(+), 74 deletions(-)