[cig-commits] [commit] master: Merge pull request #99 from geodynamics/split_mt (ed52c21)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/1f0b803e9189e4c6cc1ff3065bbc5da699dc80b6...ed52c21032887e6b42abbaae627a9c5366690913

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

commit ed52c21032887e6b42abbaae627a9c5366690913
Merge: 1f0b803 2f2135d
Author: Ian Rose <ian.r.rose at gmail.com>
Date:   Mon Jan 5 10:29:01 2015 -0800

    Merge pull request #99 from geodynamics/split_mt
    
    MT split into isothermal and thermal



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

ed52c21032887e6b42abbaae627a9c5366690913
 .../HHPH2013data_to_burnman.py                     |   2 +-
 .../HPdata_to_burnman.py                           |   2 +-
 burnman/eos/__init__.py                            |   1 +
 burnman/eos/helper.py                              |   5 +-
 burnman/eos/{modified_tait.py => hp.py}            |  89 ++---
 burnman/eos/modified_tait.py                       | 351 ++++--------------
 burnman/mineral.py                                 |  16 +-
 burnman/minerals/HHPH_2013.py                      |  86 ++---
 burnman/minerals/HP_2011_ds62.py                   | 408 ++++++++++-----------
 misc/benchmarks/chemical_potential_benchmarks.py   |   4 +-
 misc/benchmarks/endmember_benchmarks.py            |  33 +-
 misc/ref/endmember_benchmarks.py.out               |  39 +-
 misc/ref/example_compare_all_methods.py.out        |   8 +-
 misc/ref/example_fit_data.py.out                   |   4 +-
 misc/ref/paper_fit_data.py.out                     |   4 +-
 misc/table.py                                      |   2 +-
 tests/test_endmembers.py                           |  73 ++++
 tests/test_solidsolution.py                        |   6 +-
 tests/tests.py                                     |   1 +
 19 files changed, 523 insertions(+), 611 deletions(-)