[cig-commits] [commit] add_thermodynamic_potentials: Merge branch 'add_thermodynamic_potentials' of https://github.com/geodynamics/burnman into add_thermodynamic_potentials (ba0b61a)

[cig_noreply at geodynamics.org]

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

On branch  : add_thermodynamic_potentials
Link       : https://github.com/geodynamics/burnman/compare/d52a15cda6a0bbf70dcf7a9a6fc6ecd733956739...16364559f0c2bd31629704786bfc9fb47bd7eb7d

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

commit ba0b61ac71e4b6e2c703e71225ef9db061718253
Merge: 5e4f39c 8b9fb89
Author: Bob Myhill <myhill.bob at gmail.com>
Date:   Tue Dec 9 21:48:06 2014 -0800

    Merge branch 'add_thermodynamic_potentials' of https://github.com/geodynamics/burnman into add_thermodynamic_potentials



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

ba0b61ac71e4b6e2c703e71225ef9db061718253
 burnman/HHPH2013data_to_burnman.py                 |   66 +
 burnman/HPdata_to_burnman.py                       |  102 +
 burnman/SLBdata_to_burnman.py                      |   67 +
 burnman/TO_DO_LIST.txt                             |    6 +
 burnman/__init__.py                                |    4 +
 burnman/birch_murnaghan.py                         |    3 +
 burnman/chemicalpotentials.py                      |  139 +
 burnman/composite.py                               |    1 +
 burnman/cork.py                                    |  126 +
 .../input_figures/Avseth_et_al_2010_fig3_K.png     |  Bin 0 -> 149499 bytes
 .../input_figures/Hashin_Shtrikman_1963_fig1_K.png |  Bin 0 -> 43826 bytes
 .../input_figures/Hashin_Shtrikman_1963_fig2_G.png |  Bin 0 -> 52707 bytes
 .../input_figures/Hashin_Shtrikman_1963_fig3_E.png |  Bin 0 -> 63529 bytes
 burnman/data/input_masses/atomic_masses.dat        |   87 +
 burnman/data/input_minphys/slb_fig7.txt            |   48 +-
 .../raw_endmember_datasets/HHPH2013_endmembers.dat |   44 +
 burnman/data/raw_endmember_datasets/slb_2011.txt   |   48 +
 burnman/data/raw_endmember_datasets/tc-buffers.txt |   35 +
 burnman/data/raw_endmember_datasets/tc-ds62.txt    | 2494 ++++++++++++
 burnman/debye.py                                   |   18 +-
 burnman/einstein.py                                |   57 +
 burnman/equation_of_state.py                       |  100 +
 burnman/equilibriumassemblage.py                   |  206 +
 burnman/gibbsminimization.py                       |  229 ++
 burnman/mie_grueneisen_debye.py                    |   11 +-
 burnman/mineral.py                                 |   46 +-
 burnman/minerals/HHPH_2013.py                      |  969 +++++
 burnman/minerals/HP_2011.py                        |  212 +
 burnman/minerals/HP_2011_ds62.py                   | 4062 ++++++++++++++++++++
 burnman/minerals/HP_2011_fluids.py                 |  124 +
 burnman/minerals/Metal_Metal_oxides.py             |  160 +
 burnman/minerals/SLB_2011.py                       | 1984 +++++++++-
 burnman/minerals/__init__.py                       |    7 +-
 burnman/minerals/other.py                          |   25 +
 burnman/modified_tait.py                           |  267 ++
 burnman/processchemistry.py                        |  279 ++
 burnman/slb.py                                     |   56 +
 burnman/solidsolution.py                           |   80 +
 burnman/solutionmodel.py                           |  248 ++
 burnman/test_chemicalpotentials.py                 |   84 +
 burnman/test_solidsolution_parsing.py              |   76 +
 configurational_entropy.png                        |  Bin 0 -> 97173 bytes
 dicats.png                                         |  Bin 0 -> 152691 bytes
 misc/molar_mass.py                                 |   47 +
 olivine_wadsleyite.py                              |   42 +
 solidsolution_benchmarks.py                        |  302 ++
 test_gibbs.py                                      |   89 +
 test_solidsolution.py                              |   74 +
 test_tc_clone.py                                   |  190 +
 tests/benchmark.py                                 |  165 +-
 tests/test_P-V.py                                  |   26 +
 tests/test_gibbs_HP2011_endmembers.py              |  308 ++
 52 files changed, 13610 insertions(+), 203 deletions(-)