[cig-commits] [commit] master: Merge pull request #50 from bobmyhill/velocity_averaging (ab0efb9)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/96a37e8bbbe737b38fba242d3e2f77955d11c99a...ab0efb9b1ff17b6d893db6c4d457836c768cdd59

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

commit ab0efb9b1ff17b6d893db6c4d457836c768cdd59
Merge: 96a37e8 de60f26
Author: Ian Rose <ian.r.rose at gmail.com>
Date:   Tue Dec 9 22:34:07 2014 -0800

    Merge pull request #50 from bobmyhill/velocity_averaging
    
    Velocity averaging



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

ab0efb9b1ff17b6d893db6c4d457836c768cdd59
 .../input_figures/Avseth_et_al_2010_fig3_K.png     | Bin 0 -> 149499 bytes
 .../input_figures/Hashin_Shtrikman_1963_fig1_K.png | Bin 0 -> 43826 bytes
 .../input_figures/Hashin_Shtrikman_1963_fig2_G.png | Bin 0 -> 52707 bytes
 .../input_figures/Hashin_Shtrikman_1963_fig3_E.png | Bin 0 -> 63529 bytes
 tests/benchmark.py                                 | 161 +++++++++++++++++++--
 5 files changed, 145 insertions(+), 16 deletions(-)