[cig-commits] [commit] master: Merge pull request #68 from tjhei/test_improvements (916ee6a)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/6111717707e0bd07c31d999c20c7a56db163ff48...916ee6acd98bd253c534a4b858b8d86ec62c3fd5

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

commit 916ee6acd98bd253c534a4b858b8d86ec62c3fd5
Merge: 6111717 2f6ee89
Author: Ian Rose <ian.r.rose at gmail.com>
Date:   Fri Dec 12 16:32:14 2014 -0800

    Merge pull request #68 from tjhei/test_improvements
    
    - move benchmarks into misc/benchmarks/
    - check for tabs in .py



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

916ee6acd98bd253c534a4b858b8d86ec62c3fd5
 burnman/molar_mass.py                              |  47 ---------------------
 examples/example_user_input_material.py            |   6 +--
 {tests => misc/benchmarks}/benchmark.py            |  34 +++++++--------
 .../benchmarks/configurational_entropy.png         | Bin
 {tests => misc/benchmarks}/debye.py                |   7 ++-
 dicats.png => misc/benchmarks/dicats.png           | Bin
 .../benchmarks/solidsolution_benchmarks.py         |   3 ++
 test.sh                                            |  30 +++++++++----
 8 files changed, 48 insertions(+), 79 deletions(-)