[cig-commits] [commit] master: Merge pull request #84 from bobmyhill/test_site_occupancies (7c010ac)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/881b878da7bd7228b4e714d9d10c4a75c876efb6...7c010ac6610ee014aabcb76a2a4f667a06a8e7f7

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

commit 7c010ac6610ee014aabcb76a2a4f667a06a8e7f7
Merge: 881b878 1c6cf41
Author: Timo Heister <timo.heister at gmail.com>
Date:   Sat Dec 13 00:32:26 2014 -0500

    Merge pull request #84 from bobmyhill/test_site_occupancies
    
    Test site occupancies



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

7c010ac6610ee014aabcb76a2a4f667a06a8e7f7
 burnman/solidsolution.py                    |  8 +--
 burnman/solutionmodel.py                    | 89 ++++++++++++++---------------
 burnman/test_solidsolution_parsing.py       | 76 ------------------------
 misc/benchmarks/solidsolution_benchmarks.py | 17 +++---
 tests/test_solidsolution.py                 | 26 +++++++++
 5 files changed, 81 insertions(+), 135 deletions(-)