[cig-commits] [commit] master: Merge pull request #101 from ian-r-rose/augment_solutionmodel_base (b1584d2)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/911aa89d9079e32f4cee0d042a9ab7ec493c74c1...b1584d2363e96870d7fa5f75e71b16d436be6c38

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

commit b1584d2363e96870d7fa5f75e71b16d436be6c38
Merge: 911aa89 c1259b3
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Wed Dec 31 23:34:38 2014 +0000

    Merge pull request #101 from ian-r-rose/augment_solutionmodel_base
    
    SolidSolution asked for excess_enthalpy and excess_entropy



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

b1584d2363e96870d7fa5f75e71b16d436be6c38
 burnman/solutionmodel.py | 60 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 6 deletions(-)