[cig-commits] [commit] master: Merge branch 'add_gibbs_energy' (7497705)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/f77851846a7547f951f6ac38c04d7ba063e28334...2a12ed4b9abc2b07a9cf3b4ea9938b51cf002aa6

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

commit 749770507b60c719586f47138615c4bfafe3e752
Merge: f778518 aec027d
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Dec 12 09:25:14 2014 -0800

    Merge branch 'add_gibbs_energy'
    
    This is a cherry-pick/rewrite of the changes in add_thermodynamic_potentials
    to only contain:
    
    - gibbs free energy computation of endmembers
    - the new SolidSolution class
    - some test
    
    Conflicts:
    	tests/tests.py



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

749770507b60c719586f47138615c4bfafe3e752
 burnman/__init__.py                         |   2 +
 burnman/birch_murnaghan.py                  |   3 +
 burnman/cork.py                             | 126 ++++++++++++
 burnman/data/input_masses/atomic_masses.dat |  87 ++++++++
 burnman/data/input_minphys/slb_fig7.txt     |  48 ++---
 burnman/debye.py                            |  14 +-
 burnman/einstein.py                         |  57 ++++++
 burnman/endmemberdisorder.py                | 150 ++++++++++++++
 burnman/equation_of_state.py                | 105 ++++++++++
 burnman/mie_grueneisen_debye.py             |   6 +
 burnman/mineral.py                          |  55 ++++-
 burnman/modified_tait.py                    | 290 ++++++++++++++++++++++++++
 burnman/molar_mass.py                       |  47 +++++
 burnman/processchemistry.py                 | 279 +++++++++++++++++++++++++
 burnman/slb.py                              |  70 +++++++
 burnman/solidsolution.py                    |  82 ++++++++
 burnman/solutionmodel.py                    | 268 ++++++++++++++++++++++++
 burnman/test_solidsolution_parsing.py       |  76 +++++++
 configurational_entropy.png                 | Bin 0 -> 97173 bytes
 dicats.png                                  | Bin 0 -> 152691 bytes
 solidsolution_benchmarks.py                 | 302 ++++++++++++++++++++++++++++
 tests/benchmark.py                          |   5 +
 tests/test_solidsolution.py                 | 159 +++++++++++++++
 tests/tests.py                              |   1 +
 24 files changed, 2204 insertions(+), 28 deletions(-)

diff --cc tests/tests.py
index ba759fc,463107c..2572a19
--- a/tests/tests.py
+++ b/tests/tests.py
@@@ -5,7 -5,7 +5,8 @@@ from test_spin import 
  from test_composite import *
  from test_model import *
  from test_partitioning import *
 +from test_eos import *
+ from test_solidsolution import *
  
  import os, sys
  sys.path.insert(1,os.path.abspath('..'))