[cig-commits] [commit] master: Merge branch 'master' into benchmark_ownmaterialmodel (6feb229)

[cig_noreply at geodynamics.org]

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

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

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

commit 6feb2292f89d614c7117b2aed82f870b49afd310
Merge: f7d638b 9426f36
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue May 20 15:32:17 2014 -0400

    Merge branch 'master' into benchmark_ownmaterialmodel



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

6feb2292f89d614c7117b2aed82f870b49afd310
 data/initial temperature/solidus.Mars              |  13 +
 doc/modules/changes.h                              |   7 +
 .../{harmonic_perturbation.h => solidus.h}         | 111 ++++++--
 ...tatistics.h => spherical_velocity_statistics.h} |  12 +-
 source/initial_conditions/solidus.cc               | 302 +++++++++++++++++++++
 .../postprocess/spherical_velocity_statistics.cc   | 173 ++++++++++++
 source/simulator/assembly.cc                       |   2 -
 cookbooks/shell_simple_2d.prm => tests/solidus.prm |  41 ++-
 ...e_vel.prm => spherical_velocity_statistics.prm} |   5 +-
 tests/spherical_velocity_statistics/screen-output  | 206 ++++++++++++++
 tests/spherical_velocity_statistics/statistics     |  32 +++
 11 files changed, 854 insertions(+), 50 deletions(-)