[cig-commits] [commit] master: Merge pull request #47 from tjhei/benchmark_moving_two (b28a5fa)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/9e2ada16bd6f0bd33a51d8085b87e3df5192d3e2...b28a5faed4b83ec166a54c58154d1e1137a43bd5

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

commit b28a5faed4b83ec166a54c58154d1e1137a43bd5
Merge: 9e2ada1 f1ab3db
Author: Timo Heister <timo.heister at gmail.com>
Date:   Thu May 22 11:52:03 2014 -0500

    Merge pull request #47 from tjhei/benchmark_moving_two
    
    Benchmark moving two



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

b28a5faed4b83ec166a54c58154d1e1137a43bd5
 benchmark/{inclusion => solcx}/CMakeLists.txt      |    4 +-
 {cookbooks => benchmark/solcx}/sol_cx.prm          |    6 +-
 .../duretz_et_al.cc => benchmark/solcx/solcx.cc    | 1042 +++++++++-----------
 benchmark/{inclusion => solkz}/CMakeLists.txt      |    4 +-
 {cookbooks => benchmark/solkz}/sol_kz.prm          |    6 +-
 benchmark/solkz/solkz.cc                           |  978 ++++++++++++++++++
 .../manual/cookbooks/benchmarks/solcx.prm          |    7 +-
 .../manual/cookbooks/benchmarks/solkz.prm          |    8 +-
 doc/manual/manual.tex                              |  161 +--
 include/aspect/material_model/duretz_et_al.h       |  368 -------
 include/aspect/postprocess/duretz_et_al.h          |   70 --
 .../velocity_boundary_conditions/duretz_et_al.h    |   66 --
 source/material_model/duretz_et_al.cc              |  447 ---------
 .../velocity_boundary_conditions/duretz_et_al.cc   |   21 -
 tests/conservative_with_mpi.cc                     |    2 +
 tests/conservative_with_mpi.prm                    |    2 +-
 tests/conservative_with_mpi/screen-output          |    9 +-
 tests/graphical_output.cc                          |    2 +
 tests/graphical_output.prm                         |    4 +-
 tests/graphical_output/screen-output               |    9 +-
 tests/non_conservative_with_mpi.cc                 |    2 +
 tests/non_conservative_with_mpi.prm                |    2 +-
 tests/non_conservative_with_mpi/screen-output      |    9 +-
 tests/plugin.prm                                   |    2 +-
 tests/plugin/screen-output                         |    2 +-
 tests/prmbackslash-2.cc                            |    2 +
 tests/prmbackslash-2.prm                           |    5 +-
 tests/prmbackslash-2/screen-output                 |    9 +-
 tests/refinement_topography.cc                     |    2 +
 tests/refinement_topography.prm                    |    2 +-
 tests/refinement_topography/screen-output          |    9 +-
 tests/sol_cx_2.cc                                  |    2 +
 tests/sol_cx_2.prm                                 |    5 +-
 tests/sol_cx_2/screen-output                       |    9 +-
 tests/sol_cx_2_conservative.cc                     |    2 +
 tests/sol_cx_2_conservative.prm                    |    4 +-
 tests/sol_cx_2_conservative/screen-output          |    9 +-
 tests/sol_cx_2_normalized_pressure.cc              |    2 +
 tests/sol_cx_2_normalized_pressure.prm             |    4 +-
 tests/sol_cx_2_normalized_pressure/screen-output   |    9 +-
 tests/sol_cx_2_q3.cc                               |    2 +
 tests/sol_cx_2_q3.prm                              |    4 +-
 tests/sol_cx_2_q3/screen-output                    |    9 +-
 tests/sol_cx_4.cc                                  |    2 +
 tests/sol_cx_4.prm                                 |    4 +-
 tests/sol_cx_4/screen-output                       |    9 +-
 tests/sol_cx_4_conservative.cc                     |    2 +
 tests/sol_cx_4_conservative.prm                    |    4 +-
 tests/sol_cx_4_conservative/screen-output          |    9 +-
 tests/sol_cx_4_normalized_pressure.cc              |    2 +
 tests/sol_cx_4_normalized_pressure.prm             |    4 +-
 tests/sol_cx_4_normalized_pressure/screen-output   |    9 +-
 ..._4_normalized_pressure_large_static_pressure.cc |    2 +
 ...4_normalized_pressure_large_static_pressure.prm |    8 +-
 .../screen-output                                  |    9 +-
 ...x_4_normalized_pressure_low_solver_tolerance.cc |    2 +
 ..._4_normalized_pressure_low_solver_tolerance.prm |    4 +-
 .../screen-output                                  |    2 +
 tests/sol_cx_tracers.cc                            |    2 +
 tests/sol_cx_tracers.prm                           |    2 +-
 tests/sol_cx_tracers/screen-output                 |    2 +
 tests/sol_kz_2.cc                                  |    2 +
 tests/sol_kz_2.prm                                 |    4 +-
 tests/sol_kz_2/screen-output                       |    9 +-
 tests/sol_kz_2_cheaper_first_phase_solver.cc       |    2 +
 tests/sol_kz_2_cheaper_first_phase_solver.prm      |    4 +-
 .../screen-output                                  |    9 +-
 tests/sol_kz_2_conservative.cc                     |    2 +
 tests/sol_kz_2_conservative.prm                    |    4 +-
 tests/sol_kz_2_conservative/screen-output          |    9 +-
 tests/sol_kz_2_no_first_phase_solver.cc            |    2 +
 tests/sol_kz_2_no_first_phase_solver.prm           |    4 +-
 tests/sol_kz_2_no_first_phase_solver/screen-output |    9 +-
 tests/sol_kz_2_q3.cc                               |    2 +
 tests/sol_kz_2_q3.prm                              |    4 +-
 tests/sol_kz_2_q3/screen-output                    |    9 +-
 tests/sol_kz_4.cc                                  |    2 +
 tests/sol_kz_4.prm                                 |    4 +-
 tests/sol_kz_4/screen-output                       |    9 +-
 tests/sol_kz_4_conservative.cc                     |    2 +
 tests/sol_kz_4_conservative.prm                    |    4 +-
 tests/sol_kz_4_conservative/screen-output          |    9 +-
 .../postprocess/duretz_et_al.cc => tests/solcx.cc  | 1042 +++++++++-----------
 tests/solkz.cc                                     |  978 ++++++++++++++++++
 84 files changed, 3170 insertions(+), 2356 deletions(-)