[cig-commits] [commit] master: Merge pull request #100 from geodynamics/update_examples (3f851f0)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/b1584d2363e96870d7fa5f75e71b16d436be6c38...3f851f06618bcb112ae159cb61326e211911be2e

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

commit 3f851f06618bcb112ae159cb61326e211911be2e
Merge: b1584d2 315226f
Author: Ian Rose <ian.r.rose at gmail.com>
Date:   Wed Dec 31 15:51:49 2014 -0800

    Merge pull request #100 from geodynamics/update_examples
    
    - Created examples for solid solutions and chemical potentials
    - Added new examples to manual
    - Simplified chemical potentials functions
    - Bugfix to allow creation of an ideal solid solution



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

3f851f06618bcb112ae159cb61326e211911be2e
 burnman/__init__.py                                |   1 +
 burnman/chemicalpotentials.py                      |  14 +-
 examples/example_chemical_potentials.py            | 195 ++++++++++++++++++
 examples/example_solid_solution.py                 | 219 +++++++++++++++++++++
 misc/benchmarks/chemical_potential_benchmarks.py   |  12 +-
 misc/ref/example_chemical_potentials.py.out        |   3 +
 ...chmark.py.out => example_solid_solution.py.out} |   0
 sphinx/examples.rst                                |  23 ++-
 sphinx/figures/example_fO2.png                     | Bin 0 -> 52448 bytes
 sphinx/figures/example_solid_solution_1.png        | Bin 0 -> 49563 bytes
 sphinx/figures/example_solid_solution_2.png        | Bin 0 -> 67683 bytes
 sphinx/figures/example_solid_solution_3.png        | Bin 0 -> 47309 bytes
 sphinx/figures/example_solid_solution_4.png        | Bin 0 -> 67497 bytes
 13 files changed, 449 insertions(+), 18 deletions(-)