[cig-commits] [commit] master: Merge pull request #35 from tjhei/benchmark_ownmaterialmodel (1f4ab82)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/c883fc069e0dcc93cce45e1d52c84c05c9c4385b...1f4ab820b0191d9a4058b78c91b629bc94c437ec

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

commit 1f4ab820b0191d9a4058b78c91b629bc94c437ec
Merge: c883fc0 3a674d3
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Wed May 21 06:23:30 2014 -0500

    Merge pull request #35 from tjhei/benchmark_ownmaterialmodel
    
    Move Inclusion benchmark into Benchmark directory



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

1f4ab820b0191d9a4058b78c91b629bc94c437ec
 benchmark/inclusion/CMakeLists.txt                 |  10 +
 benchmark/inclusion/adaptive.prm                   |   9 +-
 benchmark/inclusion/{base.prm => global.prm.base}  |   9 +-
 benchmark/inclusion/inclusion.cc                   | 628 ++++++++++++++++++++
 benchmark/inclusion/run.sh                         |   2 +-
 .../manual/cookbooks/benchmarks}/inclusion.prm     |   9 +-
 doc/manual/manual.tex                              |  86 +--
 include/aspect/material_model/duretz_et_al.h       | 153 -----
 source/material_model/duretz_et_al.cc              | 209 -------
 source/postprocess/duretz_et_al.cc                 |  63 +-
 .../velocity_boundary_conditions/duretz_et_al.cc   |  63 --
 tests/inclusion_2.cc                               | 634 +++++++++++++++++++++
 tests/inclusion_2.prm                              |   6 +-
 tests/inclusion_2/screen-output                    |   2 +
 tests/inclusion_4.cc                               |   2 +
 tests/inclusion_4.prm                              |   6 +-
 tests/inclusion_4/screen-output                    |   2 +
 tests/inclusion_adaptive.cc                        |   2 +
 tests/inclusion_adaptive.prm                       |   6 +-
 tests/inclusion_adaptive/screen-output             |   9 +-
 20 files changed, 1323 insertions(+), 587 deletions(-)