[cig-commits] [commit] master: Merge branch 'master' of https://github.com/geodynamics/aspect (0ebe06a)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/19b0c92b6eac4e5192d682ac769218eb3fa1db05...1d916725840b7e74c3611154de2dcabdfa3dfdce

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

commit 0ebe06ab80ccc606655654b55309e408ac5f36b9
Merge: c1fc7e2 11c2ea4
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Fri May 23 09:13:29 2014 -0500

    Merge branch 'master' of https://github.com/geodynamics/aspect



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

0ebe06ab80ccc606655654b55309e408ac5f36b9
 include/aspect/mesh_refinement/interface.h         |  19 ++-
 .../{velocity_statistics.h => basic_statistics.h}  |  10 +-
 ...atistics.h => viscous_dissipation_statistics.h} |  13 +-
 .../mesh_refinement/minimum_refinement_function.cc |  32 ++--
 ...{velocity_statistics.cc => basic_statistics.cc} | 113 +--------------
 source/postprocess/internal_heating_statistics.cc  |   4 +-
 source/postprocess/velocity_statistics.cc          |  65 ---------
 .../postprocess/viscous_dissipation_statistics.cc  | 161 +++++++++++++++++++++
 source/simulator/helper_functions.cc               |   5 -
 source/simulator/solver.cc                         |   4 +
 tests/adiabatic_conditions.prm                     |   2 +-
 tests/box-first-time-step-alternate-bc.prm         |   2 +-
 tests/box-first-time-step.prm                      |   2 +-
 tests/box-repetitions.prm                          |   2 +-
 tests/diffusion-velocity.prm                       |   2 +-
 tests/free_surface_blob.prm                        |   2 +-
 tests/free_surface_relaxation.prm                  |   2 +-
 tests/minimum_refinement_function.prm              |   2 +-
 tests/no_adiabatic_heating_02.prm                  |   2 +-
 tests/no_adiabatic_heating_03.prm                  |   2 +-
 tests/passive_comp.prm                             |   2 +-
 tests/periodic_box.prm                             |   2 +-
 tests/periodic_box_freesurface.prm                 |   2 +-
 tests/refine_vel.prm                               |   2 +-
 tests/remove_angular_momentum.prm                  |   2 +-
 tests/remove_net_rotation.prm                      |   2 +-
 tests/simple-compressible.prm                      |   2 +-
 tests/simple-incompressible.prm                    |   2 +-
 tests/spherical_velocity_statistics.prm            |   2 +-
 tests/steinberger-compressible.prm                 |   2 +-
 tests/steinberger-incompressible.prm               |   2 +-
 tests/stokes.prm                                   |   2 +-
 tests/temperature-dependent-stokes-matrix.prm      |   2 +-
 tests/velocity_boundary_statistics.prm             |   2 +-
 tests/velocity_in_years.prm                        |   2 +-
 ...okes.prm => viscous_dissipation_statistics.prm} |   0
 .../screen-output                                  |  26 +++-
 .../solution-00000.0000.vtu                        |  45 ++++++
 .../solution-00000.pvtu                            |   0
 .../solution-00000.visit                           |   0
 .../solution.pvd                                   |   0
 .../statistics                                     |   6 +-
 42 files changed, 310 insertions(+), 243 deletions(-)