[cig-commits] [commit] master: Merge pull request #69 from lordkman/test_geotherm (1d2396e)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/498861c40268a2c440d99f9ba62ccc5ab2a79dfa...1d2396e3c9d632ea6c4c7f8cbc61788c9e87ff80

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

commit 1d2396e3c9d632ea6c4c7f8cbc61788c9e87ff80
Merge: 498861c 4e12807
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Dec 12 16:46:37 2014 -0800

    Merge pull request #69 from lordkman/test_geotherm
    
    Test geotherm



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

1d2396e3c9d632ea6c4c7f8cbc61788c9e87ff80
 burnman/geotherm.py        |  2 ++
 burnman/seismic.py         |  3 ++-
 tests/test_geotherm.py     | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/test_partitioning.py |  6 +++---
 tests/tests.py             |  2 ++
 5 files changed, 55 insertions(+), 4 deletions(-)