[cig-commits] [commit] master: Merge PR #72 (3909895)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/a4ab63ec34d5a2c5c5f7373d058a34bea198b797...39098952aafe705243308586707cc1922c38e089

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

commit 39098952aafe705243308586707cc1922c38e089
Merge: a4ab63e 7cf5c44
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Dec 12 21:07:48 2014 -0500

    Merge PR #72
    
    Added database for Holland and Powell (2011) fluids with CORK EoS



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

39098952aafe705243308586707cc1922c38e089
 burnman/eos/cork.py                |   4 +-
 burnman/minerals/HP_2011_fluids.py | 130 +++++++++++++++++++++++++++++++++++++
 burnman/minerals/__init__.py       |   2 +
 misc/ref/table.py.out              |   6 ++
 4 files changed, 140 insertions(+), 2 deletions(-)