[cig-commits] [commit] master: Merge pull request #98 from geodynamics/doc_updates (9ee39c0)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/8b5b24c5a92f851d6047aff401a303d19b15c9a6...9ee39c020bb9cdc3bd25572f699d836555914622

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

commit 9ee39c020bb9cdc3bd25572f699d836555914622
Merge: 8b5b24c f872cc9
Author: Timo Heister <timo.heister at gmail.com>
Date:   Mon Jan 5 15:34:26 2015 -0500

    Merge pull request #98 from geodynamics/doc_updates
    
    Doc updates
    
    The main changes are as follows:
    
    Slightly changed the cover page and intro to reflect the changes made this month
    Split the background into several .txt files to facilitate faster editing
    Reordered and added detail to the EoS background
    Added background to solid solution processing
    Added autoclass and autofunction calls for the new thermodynamics functions
    Added many thermodynamics references to ref.bib



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

9ee39c020bb9cdc3bd25572f699d836555914622
 burnman/__init__.py                     |  27 ++-
 burnman/averaging_schemes.py            |   5 +-
 burnman/eos/mie_grueneisen_debye.py     |   8 +-
 burnman/eos/slb.py                      |   2 +-
 burnman/mineral.py                      |   9 +-
 burnman/mineral_helpers.py              |   4 +
 burnman/processchemistry.py             | 107 ++++----
 burnman/solidsolution.py                |   4 +-
 burnman/solutionmodel.py                |   6 +-
 examples/example_chemical_potentials.py |   2 +-
 examples/example_solid_solution.py      |   2 +-
 sphinx/background.rst                   | 418 +-------------------------------
 sphinx/background_aggregates.txt        |  95 ++++++++
 sphinx/background_gibbsminimization.txt |   4 +
 sphinx/background_solidsolutions.txt    |  62 +++++
 sphinx/background_thermodynamics.txt    |  54 +++++
 sphinx/background_thermoelastics.txt    | 277 +++++++++++++++++++++
 sphinx/background_userinputs.txt        | 119 +++++++++
 sphinx/conf.py                          |   2 +-
 sphinx/eos.rst                          |  13 +-
 sphinx/examples.rst                     |   5 +-
 sphinx/index.rst                        |   5 +-
 sphinx/materials.rst                    |  44 ++++
 sphinx/minerals.rst                     |  39 ---
 sphinx/ref.bib                          | 249 +++++++++++++++++++
 sphinx/thermodynamics.rst               |  41 ++++
 26 files changed, 1070 insertions(+), 533 deletions(-)