[cig-commits] [commit] master: Merge remote-tracking branch 'cig/master' (81e9bac)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/6ea7dc559fc7b64e0a243ed697a5eb2bbf36ee8e...35396000d433414de271f3c2324ccecb96a479bb

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

commit 81e9bacbfae25c26eb7656f1e38fc52a60f61fc8
Merge: 9958f26 6ea7dc5
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Jun 6 16:56:14 2014 -0400

    Merge remote-tracking branch 'cig/master'



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

81e9bacbfae25c26eb7656f1e38fc52a60f61fc8
 VERSION                                            |     2 +-
 data/initial-conditions/S40RTS/S20RTS.sph          |  1051 ++
 data/initial-conditions/S40RTS/S40RTS.sph          |  3613 +++++
 data/initial-conditions/S40RTS/Spline_knots.txt    |    23 +
 doc/manual/manual.tex                              |    39 +-
 doc/modules/changes.h                              |   196 +-
 doc/modules/{changes.h => to-1.1.h}                |    30 +-
 doc/release-tasklist                               |     9 +-
 .../aspect/adiabatic_conditions/initial_profile.h  |   125 +-
 include/aspect/adiabatic_conditions/interface.h    |   158 +-
 include/aspect/boundary_composition/box.h          |     8 +-
 include/aspect/boundary_composition/interface.h    |     7 +
 include/aspect/boundary_temperature/interface.h    |     7 +
 .../compositional_initial_conditions/interface.h   |     5 +-
 include/aspect/geometry_model/interface.h          |     7 +
 include/aspect/global.h                            |    47 +-
 include/aspect/gravity_model/interface.h           |     7 +
 include/aspect/heating_model/interface.h           |     4 +-
 .../initial_conditions/S40RTS_perturbation.h       |   143 +
 include/aspect/initial_conditions/interface.h      |     7 +-
 include/aspect/material_model/interface.h          |     4 +-
 include/aspect/material_model/steinberger.h        |     1 +
 include/aspect/mesh_refinement/interface.h         |     7 +
 include/aspect/plugins.h                           |     2 -
 include/aspect/postprocess/interface.h             |     5 +
 include/aspect/simulator.h                         |    13 +-
 include/aspect/simulator_access.h                  |    10 +
 include/aspect/termination_criteria/interface.h    |     7 +
 .../aspect/velocity_boundary_conditions/gplates.h  |     7 +-
 .../velocity_boundary_conditions/interface.h       |    16 +-
 source/adiabatic_conditions/initial_profile.cc     |    20 +-
 source/adiabatic_conditions/interface.cc           |     8 +-
 source/boundary_composition/box.cc                 |     7 +-
 source/boundary_composition/interface.cc           |     5 +-
 source/boundary_temperature/interface.cc           |     4 +
 .../compositional_initial_conditions/interface.cc  |     1 -
 source/geometry_model/interface.cc                 |     4 +
 source/gravity_model/interface.cc                  |     5 +
 source/heating_model/interface.cc                  |     1 -
 source/initial_conditions/S40RTS_perturbation.cc   |   668 +
 source/initial_conditions/adiabatic.cc             |     4 +-
 source/initial_conditions/interface.cc             |     1 -
 source/initial_conditions/spherical_shell.cc       |    18 +-
 source/main.cc                                     |    21 +-
 source/material_model/interface.cc                 |     1 -
 source/mesh_refinement/composition.cc              |     2 +-
 source/mesh_refinement/interface.cc                |     5 +
 source/mesh_refinement/temperature.cc              |     0
 source/postprocess/interface.cc                    |     4 +
 source/postprocess/visualization.cc                |    88 +-
 .../visualization/nonadiabatic_pressure.cc         |     2 +-
 source/simulator/core.cc                           |    28 +-
 source/simulator/simulator_access.cc               |     9 +-
 source/simulator/solver.cc                         |   141 +-
 source/termination_criteria/interface.cc           |    12 +-
 source/velocity_boundary_conditions/gplates.cc     |     5 +-
 source/velocity_boundary_conditions/interface.cc   |    13 +-
 tests/CMakeLists.txt                               |   326 +-
 tests/composition_names.prm                        |     2 +-
 tests/composition_names/screen-output              |    30 +-
 tests/composition_names/statistics                 |     2 +-
 tests/direct_solver_2.prm                          |     2 +-
 ...first-time-step.prm => graphical_output_02.prm} |    22 +-
 .../screen-output                                  |    41 +-
 .../solution-00000.0000.gnuplot                    |   119 +
 tests/graphical_output_02/statistics               |    25 +
 .../initial_condition_S20RTS.prm                   |    43 +-
 tests/initial_condition_S20RTS/screen-output       |    39 +
 .../solution-00000.0000.gnuplot                    |  4615 ++++++
 .../statistics                                     |     5 +-
 .../initial_condition_S40RTS.prm                   |    43 +-
 tests/initial_condition_S40RTS/screen-output       |    39 +
 .../solution-00000.0000.gnuplot                    |  4615 ++++++
 .../statistics                                     |     5 +-
 .../melt_postprocessor_peridotite.prm              |    70 +-
 tests/melt_postprocessor_peridotite/screen-output  |    38 +
 .../solution-00000.0000.gnuplot                    | 14343 +++++++++++++++++++
 .../solution-00000.0001.gnuplot                    | 14343 +++++++++++++++++++
 .../statistics                                     |     2 +-
 .../melt_postprocessor_pyroxenite.prm              |    79 +-
 tests/melt_postprocessor_pyroxenite/screen-output  |    42 +
 .../solution-00000.0000.gnuplot                    | 14343 +++++++++++++++++++
 .../solution-00000.0001.gnuplot                    | 14343 +++++++++++++++++++
 .../statistics                                     |    10 +-
 tests/minimum_refinement_function.prm              |     2 +-
 .../solution-00003.0000.gnuplot                    |  4585 ++++++
 .../solution-00003.0000.vtu                        |    39 -
 .../solution-00003.0001.gnuplot                    |  4592 ++++++
 .../solution-00003.0001.vtu                        |    39 -
 ...ition_names.prm => petsc_composition_names.prm} |     2 +-
 .../screen-output                                  |     2 +-
 .../solution-00000.0000.vtu                        |     0
 .../statistics                                     |     2 +-
 ...rst-time-step.prm => vis_velocity_in_years.prm} |     7 +-
 .../screen-output                                  |    28 +-
 .../solution-00000.0000.gnuplot                    |  7175 ++++++++++
 .../statistics                                     |    10 +-
 97 files changed, 89732 insertions(+), 974 deletions(-)