[cig-commits] [commit] inversion, master, validate_MT_params: Merge pull request #64 from bobmyhill/update_databases (f778518)

[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 f77851846a7547f951f6ac38c04d7ba063e28334
Merge: a1ab1c5 64485e8
Author: Sanne Cottaar <sannecottaar at users.noreply.github.com>
Date:   Fri Dec 12 08:31:13 2014 -0800

    Merge pull request #64 from bobmyhill/update_databases
    
    Create new endmember and solid solution databases



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

f77851846a7547f951f6ac38c04d7ba063e28334
 .../raw_endmember_datasets/HHPH2013_endmembers.dat |   44 +
 .../HHPH2013data_to_burnman.py                     |   87 +
 .../raw_endmember_datasets/HPdata_to_burnman.py    |  126 +
 .../raw_endmember_datasets/SLBdata_to_burnman.py   |   93 +
 burnman/data/raw_endmember_datasets/slb_2011.txt   |   48 +
 .../raw_endmember_datasets/slb_2011_aliases.txt    |  105 +
 .../raw_endmember_datasets/slb_2011_solutions.txt  |  179 +
 burnman/data/raw_endmember_datasets/tc-ds62.txt    | 2494 ++++++++++++
 .../raw_endmember_datasets/tc-ds62_solutions.txt   |   20 +
 burnman/minerals/HHPH_2013.py                      | 1012 +++++
 burnman/minerals/HP_2011_ds62.py                   | 4270 ++++++++++++++++++++
 burnman/minerals/SLB_2011.py                       | 1977 ++++++++-
 burnman/minerals/__init__.py                       |   25 +-
 13 files changed, 10343 insertions(+), 137 deletions(-)