[cig-commits] [commit] doc_updates's head updated: Merge branch 'master' into doc_updates (b439f5f)

[cig_noreply at geodynamics.org]

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

Branch 'doc_updates' now includes:

     dcd0f36 Should not validate G, G' for cases when it is nan
     1801d7c Write tests, fix up some validation
     ca4a16a Add G to comparison arrays. Not a great test, as this is zero for MTait, but at least checks it is set...
     603e41c Add arithmetic and harmonic averages for G in solidsolution (thanks to Mark Panning for pointing out they were missing)
     11466f5 Remove integer check
     a0ff0f1 Add set_method to solid solution
     2c49c97 Use harmonic mean for now
     8afad1d Check for zero shear modulus
     b732698 Merge pull request #96 from ian-r-rose/add_set_method_to_solidsolution
     4959d3f Updated todo.txt
     79ecc7f Merge pull request #97 from bobmyhill/todo_update
     6cb3468 Apply patch from Timo
     911aa89 Merge pull request #93 from ian-r-rose/add_shear_to_solidsolution
     58450e1 Alpha of MT split into isothermal and thermal
     a0c9971 Updated chemical potentials
     c7f47cd Updated chemical potential benchmarks
     c8fa38b Updated __init__.py
     5cf9ec9 Bugfix allowing for creation of ideal solutions
     d82e75d Created chemical potentials example document
     b0fa391 Created solid solution example document
     d171a45 Added output figures from examples for manual
     08a5688 Updated examples.rst for manual
     b0844bf Reverted change to K' validation for MT
     beeb267 Tweak fO2 figure for manual
     bf39df3 Neatened description of example_solid_solution
     c1259b3 SolidSolution asked for excess_enthalpy and excess_entropy, which are not always defined.  Make dummy functions in the base class that returns zero.
     b1584d2 Merge pull request #101 from ian-r-rose/augment_solutionmodel_base
     315226f Reverted changes to solidsolution.py
     3f851f0 Merge pull request #100 from geodynamics/update_examples
     975b8a5 Add dummy function for C_p to MT
     478aeeb Tweak blurb and add equation of state redefinition in mineral.py
     ed9a385 Add MT to benchmarks
     a4841fe Name change: mtait -> hp_tmt, isomt -> mtait
     1f0b803 Merge pull request #91 from ian-r-rose/adjust_validation
     6e4d527 Name change: mtait -> mt for function-name consistency
     2992e6a HP_TMT function blurb updated
     a363ce0 Added tests for MT - HP_TMT endmembers
     69e63fe Added reset of attributes during EoS reset
     252dfa3 Added detail to HP_TMT and MT class documentation
     2f2135d Changed set_method reset algorithm
     ed52c21 Merge pull request #99 from geodynamics/split_mt
     b439f5f Merge branch 'master' into doc_updates