[cig-commits] [commit] master: Merge pull request #109 from bobmyhill/rename_base_material (8aee592)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/13c3b5da6e033552984fd69e2bcd574f84b3ab46...8aee59268d8ff56258173abbd93ed12a3d6c0f2c

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

commit 8aee59268d8ff56258173abbd93ed12a3d6c0f2c
Merge: 13c3b5d 5bd1b5a
Author: Ian Rose <ian.r.rose at gmail.com>
Date:   Wed Jan 7 11:25:48 2015 -0800

    Merge pull request #109 from bobmyhill/rename_base_material
    
    Renames *base_material* and *base_materials* to *endmembers*.



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

8aee59268d8ff56258173abbd93ed12a3d6c0f2c
 burnman/chemicalpotentials.py                      |  2 +-
 .../slb_2011_solutions.txt                         | 56 +++++++++++-----------
 burnman/mineral_helpers.py                         | 42 ++++++++--------
 burnman/minerals/Murakami_2013.py                  |  8 ++--
 burnman/minerals/SLB_2005.py                       |  8 ++--
 burnman/minerals/SLB_2011.py                       | 56 +++++++++++-----------
 burnman/minerals/SLB_2011_ZSB_2013.py              |  8 ++--
 burnman/minerals/other.py                          | 12 ++---
 burnman/solidsolution.py                           | 38 +++++++--------
 misc/benchmarks/solidsolution_benchmarks.py        | 36 +++++++-------
 misc/paper_incorrect_averaging.py                  |  8 ++--
 misc/paper_onefit.py                               |  6 +--
 misc/pyrolite_uncertainty.py                       |  6 +--
 tests/test_solidsolution.py                        | 28 +++++------
 14 files changed, 157 insertions(+), 157 deletions(-)