[cig-commits] [commit] master: Merge from upstream (094a761)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/f9e98afa04e8c5c76f20ffa2003a4ed893f55a8a...153341ebd8b3224570769d7f5cd3dc72b7db127c

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

commit 094a761ec747000b897236632d54da9c9542be09
Merge: 82b6efd fa9e02e
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Wed May 21 09:51:41 2014 -0500

    Merge from upstream



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

094a761ec747000b897236632d54da9c9542be09
 doc/modules/changes.h                              |   5 +
 include/aspect/introspection.h                     |  48 ++++++++-
 include/aspect/simulator.h                         |  31 +++---
 source/postprocess/composition_statistics.cc       |  12 +--
 source/postprocess/visualization.cc                |   3 +-
 source/simulator/assembly.cc                       | 112 ++++++++++-----------
 source/simulator/core.cc                           |  55 +++++-----
 source/simulator/helper_functions.cc               |  48 ++++-----
 source/simulator/initial_conditions.cc             |   6 +-
 source/simulator/introspection.cc                  |  54 ++++++++--
 source/simulator/parameters.cc                     |  34 +++++++
 source/simulator/simulator_access.cc               |   4 +-
 source/simulator/solver.cc                         |  16 +--
 tests/always_refine/statistics                     |  12 +--
 tests/composition-active/statistics                |  12 +--
 ...finement_function.prm => composition_names.prm} |  98 ++++--------------
 tests/composition_names/screen-output              |  43 ++++++++
 tests/composition_names/solution-00000.0000.vtu    |  43 ++++++++
 tests/composition_names/statistics                 |  19 ++++
 tests/composition_reaction/statistics              |  12 +--
 tests/postprocess_initial/statistics               |  12 +--
 21 files changed, 419 insertions(+), 260 deletions(-)

diff --cc doc/modules/changes.h
index 54dbe0e,7746c44..9c27724
--- a/doc/modules/changes.h
+++ b/doc/modules/changes.h
@@@ -5,12 -5,11 +5,17 @@@
   * 1.0. All entries are signed with the names of the author. </p>
   *
   * <ol>
 - * <li>New: Composisitional fields have names now. If no names are specified in 
 + * <li>New: There is now a new postprocessor "velocity boundary statistics"
 + * that computes statistics about the minimal and maximal velocities on each
 + * piece of the boundary.
 + * <br>
 + * (Anne Glerum, 2014/05/21)
 + *
++ * <li>New: Compositional fields have names now. If no names are specified in 
+  * the input file, the previously used names C_1, C_2, ... are used as a default. 
+  * <br>
 - * (Juliane Dannberg, 2014/05/22)
 -
++ * (Juliane Dannberg, 2014/05/21)
++ *
   * <li>New: There is now a new initial temperature condition plugin that can read in
   * solidus temperatures from a file and add perturbations to it. There is also
   * a corresponding data file for initial conditions for Mars from Permentier