[cig-commits] [commit] master: Merge pull request #2 from tjhei/reorderbenchmarks (7b60f0b)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/485a82a477d4e359644ce65c4155a55cdde612d7...7b60f0be040eacf5c8619a8e155331ef57bec890

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

commit 7b60f0be040eacf5c8619a8e155331ef57bec890
Merge: 485a82a 8807ba9
Author: Timo Heister <timo.heister at gmail.com>
Date:   Mon May 12 15:38:44 2014 -0400

    Merge pull request #2 from tjhei/reorderbenchmarks
    
    Reorder benchmarks



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

7b60f0be040eacf5c8619a8e155331ef57bec890
 .../inclusion/adaptive.prm                           | 19 +++++++++++++++++--
 .../inclusion.prm => benchmark/inclusion/base.prm    |  2 +-
 benchmark/inclusion/notes.txt                        |  2 ++
 benchmark/inclusion/run.sh                           | 20 ++++++++++++++++++++
 {tangurnis => benchmark/tangurnis}/Makefile          |  4 ++--
 {tangurnis => benchmark/tangurnis}/ba/tan.prm        |  0
 {tangurnis => benchmark/tangurnis}/matlab.m          |  0
 benchmark/tangurnis/notes.txt                        |  1 +
 {tangurnis => benchmark/tangurnis}/tala/tan.prm      |  0
 {tangurnis => benchmark/tangurnis}/tala_c/tan.prm    |  0
 10 files changed, 43 insertions(+), 5 deletions(-)