[cig-commits] [commit] master: Merge pull request #55 from tjhei/pull-46_setmethod (bc315ff)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/c5ec36a308413012ee5b0763ccb541c2ad56f382...bc315ff9a2ed1d4871962882f0626468342f1ffc

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

commit bc315ff9a2ed1d4871962882f0626468342f1ffc
Merge: c5ec36a a2a6310
Author: Ian Rose <ian.r.rose at gmail.com>
Date:   Thu Dec 11 12:19:29 2014 -0800

    Merge pull request #55 from tjhei/pull-46_setmethod
    
    Sannes #46 with additional cleanup.
    
    Fixes #40 .
    Automatically sets the eos for minerals when defined. I took a lot of the set_methods out of the examples.
    This also slightly resolves not seeing the method strings to much (Issue #8). However, it has made it more explicit what a mineral database looks like. I think the parser Ian and Bob wrote can easily be adapted. But I also think it would be an important part of the new manual. I can easily see people run into issues when they don't have the right format.



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

bc315ff9a2ed1d4871962882f0626468342f1ffc
 burnman/equation_of_state.py                |  2 +-
 burnman/mineral.py                          | 79 ++++++++++++++++++-----------
 burnman/mineral_helpers.py                  | 25 +++++----
 burnman/minerals/Matas_etal_2007.py         |  7 +++
 burnman/minerals/Murakami_2013.py           |  7 +++
 burnman/minerals/Murakami_etal_2012.py      | 14 ++++-
 burnman/minerals/SLB_2005.py                |  6 ++-
 burnman/minerals/SLB_2011.py                |  6 ++-
 burnman/minerals/SLB_2011_ZSB_2013.py       |  7 +++
 burnman/minerals/other.py                   |  6 +--
 examples/example_averaging.py               |  4 --
 examples/example_beginner.py                |  6 +--
 examples/example_compare_all_methods.py     |  3 +-
 examples/example_compare_enstpyro.py        | 17 -------
 examples/example_composition.py             | 11 ----
 examples/example_geotherms.py               |  1 -
 examples/example_grid.py                    |  1 -
 examples/example_inv_murakami.py            |  2 -
 examples/example_optimize_pv.py             | 15 ------
 examples/example_partition_coef.py          | 15 ------
 examples/example_premite_isothermal.py      |  1 -
 examples/example_spintransition.py          |  7 ---
 examples/example_user_input_material.py     |  7 +--
 examples/example_woutput.py                 | 15 ------
 misc/paper_averaging.py                     |  4 --
 misc/paper_uncertain.py                     |  1 +
 misc/paper_uncertainty.py                   |  2 +
 misc/ref/example_compare_all_methods.py.out |  8 +++
 misc/ref/example_fit_data.py.out            |  2 +
 misc/ref/paper_fit_data.py.out              |  2 +
 misc/table.py                               |  2 -
 tests/benchmark.py                          |  1 +
 tests/test_composite.py                     |  3 --
 tests/test_model.py                         |  1 +
 tests/test_vrh.py                           |  1 +
 tests/tests.py                              |  1 -
 36 files changed, 136 insertions(+), 156 deletions(-)