[cig-commits] [commit] master: Merge pull request #81 from bobmyhill/add_solidsolution_test (881b878)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/01d4aa027e2cb33852b7efdd80e67d64e5ec8f9c...881b878da7bd7228b4e714d9d10c4a75c876efb6

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

commit 881b878da7bd7228b4e714d9d10c4a75c876efb6
Merge: 01d4aa0 8e75822
Author: Ian Rose <ian.r.rose at gmail.com>
Date:   Fri Dec 12 20:27:27 2014 -0800

    Merge pull request #81 from bobmyhill/add_solidsolution_test
    
    Add order-disorder solid solution test, fixed 0K solid solution behaviour



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

881b878da7bd7228b4e714d9d10c4a75c876efb6
 burnman/solidsolution.py                    | 10 +++++++---
 misc/benchmarks/solidsolution_benchmarks.py |  4 ++--
 tests/test_solidsolution.py                 | 20 ++++++++++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)