[cig-commits] [commit] master: Merge branch 'create_radiogenic_heating_model' of https://github.com/gassmoeller/aspect (cc43d3a)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/7b658caa05d489ae3f8d61b8049b015e7be94f77...cc43d3ac6f571573118eb54c2103bf92dfe8355f

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

commit cc43d3ac6f571573118eb54c2103bf92dfe8355f
Merge: 7b658ca 0e860f5
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri May 16 21:39:10 2014 -0400

    Merge branch 'create_radiogenic_heating_model' of https://github.com/gassmoeller/aspect
    
    Conflicts:
    	doc/modules/changes.h



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

cc43d3ac6f571573118eb54c2103bf92dfe8355f
 benchmark/tangurnis/ba/tan.prm                     |   3 -
 benchmark/tangurnis/tala/tan.prm                   |   3 -
 benchmark/tangurnis/tala_c/tan.prm                 |   3 -
 cookbooks/convection-box-3d.prm                    |   1 -
 cookbooks/convection-box.prm                       |   1 -
 cookbooks/future/blankenbach.prm                   |   1 -
 cookbooks/future/nettranslation.prm                |   1 -
 cookbooks/future/periodic_box.prm                  |   1 -
 .../radiogenic_heating.prm}                        |  75 ++++---------
 .../radiogenic_heating_function.prm}               |  77 ++++---------
 cookbooks/future/steinberger.prm                   |   1 -
 cookbooks/future/table_model.prm                   |   1 -
 cookbooks/latent-heat.prm                          |   1 -
 doc/manual/manual.tex                              |  22 ++--
 doc/modules/changes.h                              |  10 +-
 .../constant_heating.h}                            |  40 ++++---
 .../function.h                                     |  41 ++++---
 .../interface.h                                    |  88 +++++++--------
 include/aspect/simulator.h                         |   2 +
 source/heating_model/constant_heating.cc           |  91 ++++++++++++++++
 source/heating_model/function.cc                   | 119 +++++++++++++++++++++
 .../{gravity_model => heating_model}/interface.cc  |  77 ++++++++-----
 source/simulator/assembly.cc                       |   6 +-
 source/simulator/core.cc                           |   4 +
 source/simulator/parameters.cc                     |   8 +-
 tests/conservative_with_mpi.prm                    |   1 -
 tests/depth_average_01.prm                         |   1 -
 tests/depth_average_02.prm                         |   1 -
 tests/depth_average_03.prm                         |   1 -
 tests/depth_average_04.prm                         |   1 -
 tests/diffusion-velocity.prm                       |   1 -
 tests/diffusion.prm                                |   1 -
 tests/graphical_output.prm                         |   1 -
 tests/inclusion_2.prm                              |   1 -
 tests/inclusion_4.prm                              |   1 -
 tests/inclusion_adaptive.prm                       |   1 -
 tests/no_flow.prm                                  |   1 -
 tests/non_conservative_with_mpi.prm                |   1 -
 tests/passive_comp.prm                             |   1 -
 tests/plugin.prm                                   |   1 -
 tests/radiogenic_heating.prm                       | 111 +++++++++++++++++++
 .../screen-output                                  |  28 +++--
 tests/radiogenic_heating/statistics                |  13 +++
 tests/refinement_topography.prm                    |   1 -
 tests/sol_cx_2.prm                                 |   1 -
 tests/sol_cx_2_conservative.prm                    |   1 -
 tests/sol_cx_2_normalized_pressure.prm             |   1 -
 tests/sol_cx_2_q3.prm                              |   1 -
 tests/sol_cx_4.prm                                 |   1 -
 tests/sol_cx_4_conservative.prm                    |   1 -
 tests/sol_cx_4_normalized_pressure.prm             |   1 -
 ...4_normalized_pressure_large_static_pressure.prm |   1 -
 ..._4_normalized_pressure_low_solver_tolerance.prm |   1 -
 tests/sol_cx_tracers.prm                           |   1 -
 tests/sol_kz_2.prm                                 |   1 -
 tests/sol_kz_2_cheaper_first_phase_solver.prm      |   1 -
 tests/sol_kz_2_conservative.prm                    |   1 -
 tests/sol_kz_2_no_first_phase_solver.prm           |   1 -
 tests/sol_kz_2_q3.prm                              |   1 -
 tests/sol_kz_4.prm                                 |   1 -
 tests/sol_kz_4_conservative.prm                    |   1 -
 61 files changed, 554 insertions(+), 308 deletions(-)

diff --cc doc/modules/changes.h
index 3d06b8c,97d9b3f..05e71be
--- a/doc/modules/changes.h
+++ b/doc/modules/changes.h
@@@ -4,12 -4,15 +4,20 @@@
   * <p> This is the list of changes made after the release of Aspect version
   * 1.0. All entries are signed with the names of the author. </p>
   *
 - * * <ol>
++ * <ol>
+  * <li>New: There is a new plugin architecture for heating models that
+  * allows for plugins defining the radiogenic heating rate in dependency
+  * of temperature, pressure, composition, position and time. This introduces
+  * an incompatibility of input files to older versions, but the old functionality
+  * is preserved and extended.
+  * <br>
+  * (Rene Gassmoeller, 2014/05/16)
+  *
 + * <li>New: There is now a material model with reactions between compositional 
 + * fields and a cookbook describing the usage of this material model. 
 + * <br>
 + * (Juliane Dannberg, Rene Gassmoeller, 2014/05/16)
 + *
-  * <ol>
   * <li>Fixed: Times associated with visualization output are now correctly
   * modified when "Use years in output instead of seconds" is true.
   * <br>