[cig-commits] [commit] inversion, master, validate_MT_params: Merge pull request #66 from tjhei/style_fixes (6f75d37)

[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 6f75d3766c3c8e3bf6599b894e7bbe2993f57419
Merge: 53964ef 47f6e09
Author: Ian Rose <ian.r.rose at gmail.com>
Date:   Fri Dec 12 14:04:26 2014 -0800

    Merge pull request #66 from tjhei/style_fixes
    
    - python style fixes
    - rework package structure
    - fix imports
    - fix tests like table.py
    - formatting
    - some documentation



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

6f75d3766c3c8e3bf6599b894e7bbe2993f57419
 burnman/__init__.py                                |  14 +-
 burnman/averaging_schemes.py                       |  10 +-
 burnman/composite.py                               |   9 +-
 .../raw_endmember_datasets/HPdata_to_burnman.py    |   2 +-
 burnman/endmemberdisorder.py                       |   7 +-
 burnman/eos/__init__.py                            |  20 +
 burnman/{ => eos}/birch_murnaghan.py               |   6 +-
 burnman/{ => eos}/cork.py                          |   4 +-
 burnman/{ => eos}/einstein.py                      |   3 +-
 burnman/{ => eos}/equation_of_state.py             |   2 +-
 burnman/eos/helper.py                              |  43 ++
 burnman/{ => eos}/mie_grueneisen_debye.py          |   6 +-
 burnman/{ => eos}/modified_tait.py                 |   7 +-
 burnman/{ => eos}/slb.py                           |   4 +-
 burnman/geotherm.py                                |   2 +-
 burnman/main.py                                    |   1 +
 burnman/material.py                                |   2 +-
 burnman/mineral.py                                 |  47 +--
 burnman/mineral_helpers.py                         |  15 +-
 burnman/minerals/Matas_etal_2007.py                |   2 +-
 burnman/minerals/SLB_2011.py                       |  35 --
 burnman/minerals/__init__.py                       |   1 -
 burnman/minerals/other.py                          |   9 +
 burnman/molar_mass.py                              |   4 +-
 burnman/processchemistry.py                        |   4 +-
 burnman/seismic.py                                 |   8 +-
 burnman/solidsolution.py                           |  41 +-
 burnman/solutionmodel.py                           |  23 +-
 examples/example_inv_murakami.py                   |   2 +-
 misc/paper_benchmark.py                            |   2 -
 misc/paper_incorrect_averaging.py                  |   1 -
 misc/paper_opt_pv.py                               |   8 +-
 misc/paper_opt_pv_old.py                           |   4 +-
 misc/paper_uncertain.py                            |   2 +-
 misc/paper_uncertainty.py                          |   2 +-
 misc/pyrolite_uncertainty.py                       |  15 +-
 misc/ref/paper_opt_pv.py.out                       |  28 +-
 misc/ref/table.py.out                              | 444 ++++++++++++++++++---
 misc/table.py                                      |   2 +
 sphinx/minerals.rst                                |   2 +
 test.sh                                            |  18 +-
 tests/benchmark.py                                 |   6 +-
 tests/test_eos.py                                  |   4 +-
 tutorial/step_3.py                                 |  13 +-
 44 files changed, 626 insertions(+), 258 deletions(-)