[cig-commits] [commit] solid_solution_molar_mass: merge new commits (fe211b4)

[cig_noreply at geodynamics.org]

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

On branch  : solid_solution_molar_mass
Link       : https://github.com/geodynamics/burnman/compare/0000000000000000000000000000000000000000...fe211b4b277a753e04e153250e4ed8b270dee9b7

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

commit fe211b4b277a753e04e153250e4ed8b270dee9b7
Merge: d96ae53 3f851f0
Author: sannecottaar <sanne.cottaar at gmail.com>
Date:   Thu Jan 1 14:01:44 2015 +0100

    merge new commits



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

fe211b4b277a753e04e153250e4ed8b270dee9b7
 burnman/__init__.py                                |   1 +
 burnman/chemicalpotentials.py                      |  14 +-
 burnman/solutionmodel.py                           |  60 +++++-
 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
 14 files changed, 503 insertions(+), 24 deletions(-)