[cig-commits] [commit] master: Merge branch 'pr148' (a099d82)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/66732265f79522b078ed1203475718a57ca16f45...a099d82b7e88ed5c2ae7b5c5280b4867953f4aa8

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

commit a099d82b7e88ed5c2ae7b5c5280b4867953f4aa8
Merge: 6673226 efecbc3
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Jun 27 18:11:06 2014 -0400

    Merge branch 'pr148'



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

a099d82b7e88ed5c2ae7b5c5280b4867953f4aa8
 tests/box-repetitions.prm                          |     3 +
 tests/box-repetitions/solution-00000.0000.gnuplot  |   154 +
 tests/box-repetitions/solution-00000.0000.vtu      |    39 -
 tests/composition-passive-tracers/particles.pvd    |    19 -
 tests/composition_names.prm                        |     2 +-
 .../composition_names/solution-00000.0000.gnuplot  |    14 +
 tests/composition_names/solution-00000.0000.vtu    |    43 -
 tests/constant_temperature_boundary_conditions.prm |     3 +
 .../solution-00000.0000.gnuplot                    |  7175 +++++
 .../solution-00000.0000.vtu                        |    39 -
 tests/dynamic_topography.prm                       |     2 +-
 .../dynamic_topography/solution-00000.0000.gnuplot | 29183 +++++++++++++++++++
 tests/dynamic_topography/solution-00000.0000.vtu   |    43 -
 tests/graphical_output/solution-00000.pvtu         |    19 -
 tests/graphical_output/solution-00000.visit        |     2 -
 tests/graphical_output/solution.pvd                |     9 -
 tests/sol_cx_tracers/particles-00000.pvtu          |    13 -
 tests/sol_cx_tracers/particles-00010.pvtu          |    13 -
 tests/stokes.prm                                   |     1 +
 tests/stokes/solution-00000.pvtu                   |    20 -
 tests/stokes/solution-00000.visit                  |     2 -
 tests/stokes/solution.pvd                          |     9 -
 tests/viscous_dissipation_statistics.prm           |     1 +
 .../solution-00000.0000.gnuplot                    |  8455 ++++++
 .../solution-00000.0000.vtu                        |    45 -
 .../solution-00000.pvtu                            |    20 -
 .../solution-00000.visit                           |     2 -
 tests/viscous_dissipation_statistics/solution.pvd  |     9 -
 28 files changed, 44991 insertions(+), 348 deletions(-)