[cig-commits] [commit] inversion: Merge branch 'jit_optimizations' into inversion (601f721)

[cig_noreply at geodynamics.org]

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

On branch  : inversion
Link       : https://github.com/geodynamics/burnman/compare/9cf237852c30754d89efcc731fd5d788251e3d96...1098a3bf1b7cf8d21e6a06c1cca7639f1b95764a

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

commit 601f7214cf8b5746979426a633063543e8cae7e3
Merge: 9cf2378 841a4b7
Author: Timo Heister <timo.heister at gmail.com>
Date:   Sat Dec 13 00:41:26 2014 -0500

    Merge branch 'jit_optimizations' into inversion



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

601f7214cf8b5746979426a633063543e8cae7e3
 burnman/debye.py                                   |   2 +-
 burnman/eos/slb.py                                 |  80 +++++++++++--
 burnman/geotherm.py                                |   2 +-
 burnman/minerals/other.py                          |   4 +-
 burnman/solidsolution.py                           |  10 +-
 examples/example_seismic.py                        |   2 +-
 misc/benchmarks/solidsolution_benchmarks.py        | 128 ++-------------------
 misc/paper_onefit.py                               |   2 +-
 misc/paper_opt_pv.py                               |   2 +-
 misc/pyrolite_uncertainty.py                       |   2 +-
 ...mark.py.out => solidsolution_benchmarks.py.out} |   0
 sphinx/BurnMan.pdf                                 | Bin 1412263 -> 0 bytes
 tests/test_solidsolution.py                        |  20 ++++
 13 files changed, 113 insertions(+), 141 deletions(-)