[cig-commits] [commit] master: Merged changes from master (2e7647d)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/b32ac5f8f385e349bb6bc11f421a0195296a179a...e9db016d5017ab6bacf537f5824c5b1b609de881

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

commit 2e7647df4d741cb8c27f3935b709f4d1c607fefd
Merge: 6e35816 b32ac5f
Author: Jonathan Perry-Houts <jperryh2 at uoregon.edu>
Date:   Fri Aug 1 22:34:25 2014 -0700

    Merged changes from master



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

2e7647df4d741cb8c27f3935b709f4d1c607fefd
 benchmark/{solkz => burstedde}/CMakeLists.txt      |   4 +-
 .../inclusion.cc => burstedde/burstedde.cc}        | 390 ++++----
 benchmark/burstedde/burstedde.prm                  | 106 +++
 doc/Makefile                                       |   2 +-
 doc/manual.pdf                                     | Bin 12659957 -> 13151028 bytes
 .../cookbooks/benchmarks/burstedde/burstedde.prm   |  26 +
 .../cookbooks/benchmarks/burstedde/errors.pdf      | Bin 0 -> 19521 bytes
 .../cookbooks/benchmarks/burstedde/pressure.png    | Bin 0 -> 115794 bytes
 .../cookbooks/benchmarks/burstedde/velocity_x.png  | Bin 0 -> 111256 bytes
 .../cookbooks/benchmarks/burstedde/velocity_z.png  | Bin 0 -> 94551 bytes
 .../cookbooks/benchmarks/burstedde/viscosity.png   | Bin 0 -> 105333 bytes
 doc/manual/manual.bib                              |  18 +
 doc/manual/manual.tex                              | 173 +++-
 doc/manual/parameters.tex                          | 984 ++++++++++++++++++---
 doc/modules/changes.h                              |  19 +
 doc/modules/todo.h                                 |  13 +-
 doc/update_parameters.sh                           |   5 +
 .../function.h                                     |  55 +-
 .../function.h                                     |  16 +-
 .../postprocess/viscous_dissipation_statistics.h   |   2 +-
 .../{melt_fraction.h => material_properties.h}     |  73 +-
 source/boundary_temperature/function.cc            | 163 ++++
 .../function.cc                                    |  35 +-
 source/initial_conditions/S40RTS_perturbation.cc   |   2 +-
 source/material_model/latent_heat_melt.cc          |   6 +-
 .../mesh_refinement/minimum_refinement_function.cc |   6 +-
 .../postprocess/viscous_dissipation_statistics.cc  |   2 +-
 source/postprocess/visualization.cc                |  15 +-
 .../visualization/material_properties.cc           | 251 ++++++
 source/postprocess/visualization/melt_fraction.cc  |   6 +-
 source/velocity_boundary_conditions/gplates.cc     |  14 +-
 ...r-box.prm => boundary-temperature-function.prm} |  16 +-
 tests/boundary-temperature-function/screen-output  |  40 +
 .../statistics                                     |   5 +-
 .../inclusion/inclusion.cc => tests/burstedde.cc   | 390 ++++----
 tests/burstedde.prm                                | 102 +++
 tests/burstedde/screen-output                      |  41 +
 tests/{simpler-box.prm => gravity-function.prm}    |  15 +-
 tests/gravity-function/screen-output               |  39 +
 tests/gravity-function/solution-00000.0000.gnuplot | 455 ++++++++++
 .../statistics                                     |   4 +-
 tests/normalize.pl                                 |   2 +-
 tests/run_testsuite.cmake                          |  46 +-
 write_config.cmake                                 |   2 +-
 44 files changed, 2965 insertions(+), 578 deletions(-)

diff --cc doc/modules/changes.h
index 028e10b,2fb4d38..0c409bf
--- a/doc/modules/changes.h
+++ b/doc/modules/changes.h
@@@ -7,11 -7,25 +7,30 @@@
   *
   * <ol>
   *
+  * <li> New: There are now function parser plugins for the
+  * gravity model and boundary temperature model. Gravity can
+  * be prescribed in dependence of position and boundary temperature
+  * in dependence of position and time.
+  * <br>
+  * (Sanja Panovska, Rene Gassmoeller, 2014/08/01)
+  *
+  * <li> New: There is now a postprocessor that outputs multiple 
+  * material properties with just a single call to the material
+  * model. This is more efficient, but only matters for complex
+  * material models.
+  * <br>
+  * (Rene Gassmoeller, 2014/08/01)
+  * 
+  * <li> New: There is now a section in the manual detailing the
+  * "Burstedde" benchmark and its verification.
+  * <br>
+  * (Iris van Zelst, Wolfgang Bangerth, 2014/07/07)
+  *
 + * <li> New: Added "maximum refinement function" plugin to limit the depth of
 + * the mesh octree.
 + * <br>
 + * (Jonathan Perry-Houts, 2014/07/03)
 + *
   * <li> Changed: The viscosity in the steinberger material model can now be
   * calculated by taking either the lateral averaged temperature or the
   * adiabatic temperature in this depth as reference.