[cig-commits] [commit] master: Merge pull request #53 from lordkman/Cay_man (409647f)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/80c2a295c42dfdb38f83f6c1334bf7d8f97a8463...409647ff05dfad6a686198cac1481bd46b5e2e62

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

commit 409647ff05dfad6a686198cac1481bd46b5e2e62
Merge: 80c2a29 881d23d
Author: Ian Rose <ian.r.rose at gmail.com>
Date:   Fri Dec 12 18:23:31 2014 -0800

    Merge pull request #53 from lordkman/Cay_man
    
    Cleaning up manual slowly but surely.



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

409647ff05dfad6a686198cac1481bd46b5e2e62
 burnman/__init__.py                     |   8 +-
 burnman/averaging_schemes.py            | 199 ++++++++++++++++----------------
 burnman/eos/birch_murnaghan.py          |  28 ++---
 burnman/eos/equation_of_state.py        |  74 ++++++------
 burnman/eos/slb.py                      |  29 ++---
 burnman/geotherm.py                     |  35 +++---
 burnman/main.py                         |  71 ++++++------
 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           |   6 +-
 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 +-
 sphinx/BurnMan.pdf                      | Bin 0 -> 1412263 bytes
 sphinx/background.rst                   |  25 ++--
 sphinx/examples.rst                     |   8 +-
 sphinx/overview.rst                     |   6 +-
 sphinx/ref.bib                          |  48 +++++++-
 tutorial/step_3.py                      |   8 +-
 31 files changed, 328 insertions(+), 278 deletions(-)