[cig-commits] [commit] master: Merge pull request #41 from SiqiZhang/Time_dependent_radioactive_heating (d31f4e9)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/4a5e27e5690a0e0c1e13e19100af7398e37f36b8...d31f4e9435a1c12781f5b673b672cbd29c41c2c2

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

commit d31f4e9435a1c12781f5b673b672cbd29c41c2c2
Merge: 4a5e27e 63eb762
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Thu May 22 17:34:53 2014 -0500

    Merge pull request #41 from SiqiZhang/Time_dependent_radioactive_heating
    
    Radioactive decay internal heating plugin



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

d31f4e9435a1c12781f5b673b672cbd29c41c2c2
 include/aspect/heating_model/radioactive_decay.h   | 122 ++++++++++++++
 ..._statistics.h => internal_heating_statistics.h} |  12 +-
 .../{seismic_vp.h => internal_heating.h}           |  12 +-
 include/aspect/simulator_access.h                  |   6 +
 source/heating_model/radioactive_decay.cc          | 184 +++++++++++++++++++++
 source/postprocess/internal_heating_statistics.cc  | 143 ++++++++++++++++
 .../{seismic_vs.cc => internal_heating.cc}         |  39 +++--
 source/simulator/simulator_access.cc               |   7 +
 .../radioactive_decay.prm                          |  52 ++++--
 tests/radioactive_decay/screen-output              |  49 ++++++
 tests/radioactive_decay/statistics                 |  14 ++
 11 files changed, 592 insertions(+), 48 deletions(-)