[cig-commits] [commit] master: Merge pull request #141 from gassmoeller/fix_internal_heating_statistics (48f5db0)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/8ad680900561ab32ad4d0420b88f2843ad3d74b5...48f5db061ecf9e78a0c7ef83891ac7743617afcd

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

commit 48f5db061ecf9e78a0c7ef83891ac7743617afcd
Merge: 8ad6809 b7121a1
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Sun Jun 22 06:22:28 2014 -0500

    Merge pull request #141 from gassmoeller/fix_internal_heating_statistics
    
    Fix internal heating statistics



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

48f5db061ecf9e78a0c7ef83891ac7743617afcd
 doc/modules/changes.h                              | 18 ++++++
 source/postprocess/internal_heating_statistics.cc  | 66 ++++++++++++++--------
 ...heating.prm => internal_heating_statistics.prm} |  7 ++-
 .../screen-output                                  | 28 ++++-----
 .../statistics                                     |  6 +-
 tests/radioactive_decay/screen-output              | 32 +++++------
 tests/radioactive_decay/statistics                 |  4 +-
 7 files changed, 101 insertions(+), 60 deletions(-)