[cig-commits] [commit] inversion, master, validate_MT_params: Merge pull request #67 from ian-r-rose/quasiharmonic_additions (6111717)

[cig_noreply at geodynamics.org]

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

On branches: inversion,master,validate_MT_params
Link       : https://github.com/geodynamics/burnman/compare/80c2a295c42dfdb38f83f6c1334bf7d8f97a8463...409647ff05dfad6a686198cac1481bd46b5e2e62

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

commit 6111717707e0bd07c31d999c20c7a56db163ff48
Merge: e7f78ff 6e9a3f4
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Dec 12 15:48:01 2014 -0800

    Merge pull request #67 from ian-r-rose/quasiharmonic_additions
    
    Quasiharmonic additions



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

6111717707e0bd07c31d999c20c7a56db163ff48
 burnman/data/input_minphys/slb_fig7.txt | 48 ++++++++++++++++-----------------
 burnman/debye.py                        | 21 ++++++++++-----
 burnman/eos/cork.py                     |  2 +-
 burnman/eos/einstein.py                 | 28 +++----------------
 burnman/eos/equation_of_state.py        |  8 +++---
 burnman/eos/modified_tait.py            | 10 +++----
 burnman/eos/slb.py                      | 21 +++++++++------
 burnman/mineral.py                      | 22 +++++++++++----
 tests/benchmark.py                      |  8 ++++++
 9 files changed, 91 insertions(+), 77 deletions(-)