[cig-commits] [commit] inversion: Merge remote-tracking branch 'upstream/master' into inversion (dbe5744)

[cig_noreply at geodynamics.org]

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

On branch  : inversion
Link       : https://github.com/geodynamics/burnman/compare/fbb6b61f7364ae7c3d8592183d8acd4201344e50...dbe5744373435883ad2d29889becd9e4be56b1bd

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

commit dbe5744373435883ad2d29889becd9e4be56b1bd
Merge: fbb6b61 32dadcc
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Dec 12 21:40:54 2014 -0500

    Merge remote-tracking branch 'upstream/master' into inversion



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

dbe5744373435883ad2d29889becd9e4be56b1bd
 burnman/__init__.py                     |   8 +-
 burnman/averaging_schemes.py            | 199 ++++++++++++++++----------------
 burnman/eos/birch_murnaghan.py          |  28 ++---
 burnman/eos/cork.py                     |  41 ++++++-
 burnman/eos/equation_of_state.py        |  74 ++++++------
 burnman/eos/modified_tait.py            |  58 ++++++++++
 burnman/eos/slb.py                      |  29 ++---
 burnman/geotherm.py                     |  35 +++---
 burnman/main.py                         |  71 ++++++------
 burnman/minerals/HP_2011_fluids.py      | 130 +++++++++++++++++++++
 burnman/minerals/__init__.py            |   2 +
 burnman/minerals/other.py               |  75 +++++++++++-
 burnman/seismic.py                      |   4 +-
 examples/example_averaging.py           |   2 +-
 examples/example_compare_all_methods.py |   2 +-
 examples/example_composition.py         |   2 +-
 examples/example_fit_data.py            |   2 +-
 examples/example_geotherms.py           |  10 +-
 examples/example_grid.py                |   2 +-
 examples/example_partition_coef.py      |  10 +-
 examples/example_seismic.py             |  12 +-
 examples/example_user_input_material.py |   2 +-
 misc/paper_averaging.py                 |   4 +-
 misc/paper_benchmark.py                 |   2 +-
 misc/paper_fit_data.py                  |   4 +-
 misc/paper_incorrect_averaging.py       |   5 +-
 misc/paper_onefit.py                    |   2 +-
 misc/paper_opt_pv.py                    |   2 +-
 misc/paper_uncertain.py                 |   2 +-
 misc/paper_uncertainty.py               |   2 +-
 misc/ref/table.py.out                   |   6 +
 sphinx/BurnMan.pdf                      | Bin 0 -> 1412263 bytes
 sphinx/background.rst                   |  26 ++---
 sphinx/eos.rst                          |  22 ++--
 sphinx/examples.rst                     |   8 +-
 sphinx/overview.rst                     |   6 +-
 sphinx/ref.bib                          |  48 +++++++-
 tutorial/step_3.py                      |   8 +-
 38 files changed, 652 insertions(+), 293 deletions(-)