[cig-commits] [commit] master: Merge pull request #167 from bangerth (9a80865)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/3811725812cafa918bbabc2515f52af7857aad31...9a8086507e7ed22ed2a4d13771930e4ae6bc3a7d

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

commit 9a8086507e7ed22ed2a4d13771930e4ae6bc3a7d
Merge: 3811725 fa5598b
Author: Timo Heister <timo.heister at gmail.com>
Date:   Mon Aug 4 17:44:53 2014 -0400

    Merge pull request #167 from bangerth
    
    - generalize spherical hexagonal perturbation
    - spherical shell now takes the number of circumferential cells
    
    Conflicts:
    	doc/modules/changes.h



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

9a8086507e7ed22ed2a4d13771930e4ae6bc3a7d
 doc/modules/changes.h                              |   18 +-
 include/aspect/geometry_model/spherical_shell.h    |    8 +-
 .../aspect/initial_conditions/spherical_shell.h    |   31 +-
 source/geometry_model/spherical_shell.cc           |   36 +-
 source/initial_conditions/spherical_shell.cc       |   60 +-
 .../{refine_vel.prm => cells_in_circumference.prm} |   21 +-
 tests/cells_in_circumference/screen-output         |   49 +
 ...e_vel.prm => hexagonal_initial_temperature.prm} |   41 +-
 tests/hexagonal_initial_temperature/screen-output  |   39 +
 .../solution-00000.0000.gnuplot                    | 5383 ++++++++++++++++++++
 ...m => octagonal_initial_temperature-rotated.prm} |   49 +-
 .../screen-output                                  |   39 +
 .../solution-00000.0000.gnuplot                    | 5383 ++++++++++++++++++++
 ...e_vel.prm => octagonal_initial_temperature.prm} |   48 +-
 tests/octagonal_initial_temperature/screen-output  |   39 +
 .../solution-00000.0000.gnuplot                    | 5383 ++++++++++++++++++++
 16 files changed, 16518 insertions(+), 109 deletions(-)

diff --cc doc/modules/changes.h
index 6ee1bb7,703d97a..9edde5e
--- a/doc/modules/changes.h
+++ b/doc/modules/changes.h
@@@ -7,55 -7,21 +7,65 @@@
   *
   * <ol>
   *
+  * <li> New: The <code>spherical hexagonal perturbation</code> initial
+  * temperature model has been generalized to allow other modes than just
+  * the hexagonal one.
+  * <br>
 - * (Joey Durkin, 2014/07/31)
++ * (Joey Durkin, 2014/08/04)
+  *
+  * <li> New: The <code>spherical shell</code> geometry model in 2d now takes
+  * additional parameters indicating the number of circumferential cells.
+  * <br>
 - * (Joey Durkin, 2014/07/31)
++ * (Joey Durkin, 2014/08/04)
++ *
 + * <li> Changed: Updated maximum refinement function with the same
 + * bugfix as the minimum refinement function. It now always declares
 + * dim number of variables. When using the 'depth' coordinate system,
 + * only the first variable is used. The others are set to zero.
 + * <br>
 + * (Jonathan Perry-Houts, 2014/08/04)
 + *
 + * <li> Fixed: The viscosity mesh refinement criterion did not ask
 + * the material model for the viscosity, therefore it did not work
 + * with many material models. Some material models calculate the
 + * viscosity anyway, so it worked in that cases. Now the criterion
 + * asks correctly for the viscosity.
 + * <br>
 + * (Rene Gassmoeller, Juliane Dannberg 2014/08/04)
 + *
 + * <li> Changed: The minimum refinement function now always declares
 + * three variables. In the 'depth' option only the first one is
 + * set to the depth, the other variables are set to zero.
 + * <br>
 + * (Rene Gassmoeller, 2014/08/04)
 + *
 + * <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.
-  * <br>
+  * <li> Changed: The viscosity in the Steinberger material model can now be
+  * calculated by taking either the laterally averaged temperature or the
+  * adiabatic temperature at this depth as reference.
 - * <br>
   * (Rene Gassmoeller, 2014/06/20)
   *
   * <li> Changed: The minimum refinement function is now evaluated at every