[cig-commits] [commit] master: Add test for internal heating statistics. (727b6ff)

[cig_noreply at geodynamics.org]

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

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

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

commit 727b6ffe270da2e04cc6246c9e0d638424904220
Author: Rene Gassmoeller <R.Gassmoeller at mailbox.org>
Date:   Fri Jun 20 16:02:23 2014 +0200

    Add test for internal heating statistics.


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

727b6ffe270da2e04cc6246c9e0d638424904220
 ...heating.prm => internal_heating_statistics.prm} |  7 ++++--
 .../screen-output                                  | 28 ++++++++++++----------
 .../statistics                                     |  6 +++--
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/tests/radiogenic_heating.prm b/tests/internal_heating_statistics.prm
similarity index 89%
copy from tests/radiogenic_heating.prm
copy to tests/internal_heating_statistics.prm
index bca7cac..1908700 100644
--- a/tests/radiogenic_heating.prm
+++ b/tests/internal_heating_statistics.prm
@@ -1,5 +1,8 @@
 ############### Global parameters
-# This is a test for the radiogenic heating. 
+# This is a test for the radiogenic heating and the internal
+# heating statistics postprocessor. Since density and radiogenic
+# heating are constant there is an analytical solution, which
+# is reproduced in this testcase. 
 
 set Dimension = 2
 
@@ -106,6 +109,6 @@ end
 
 subsection Postprocess
 
-  set List of postprocessors = temperature statistics
+  set List of postprocessors = temperature statistics, internal heating statistics
 
 end
diff --git a/tests/radiogenic_heating/screen-output b/tests/internal_heating_statistics/screen-output
similarity index 54%
copy from tests/radiogenic_heating/screen-output
copy to tests/internal_heating_statistics/screen-output
index 891e86b..b9ac71a 100644
--- a/tests/radiogenic_heating/screen-output
+++ b/tests/internal_heating_statistics/screen-output
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.
---     . version 1.1.pre
+--     . version 1.2.pre
 --     . running in DEBUG mode
 --     . running with 1 MPI process
 --     . using Trilinos
@@ -15,7 +15,8 @@ Number of degrees of freedom: 13,764 (8,450+1,089+4,225)
    Solving Stokes system... 25 iterations.
 
    Postprocessing:
-     Temperature min/avg/max: 1000 K, 1000 K, 1000 K
+     Temperature min/avg/max:                1000 K, 1000 K, 1000 K
+     Internal heating rate (average/total):  1 W/kg, 3.4e+15 W
 
 *** Timestep 1:  t=1000 seconds
    Solving temperature system... 9 iterations.
@@ -23,24 +24,25 @@ Number of degrees of freedom: 13,764 (8,450+1,089+4,225)
    Solving Stokes system... 0 iterations.
 
    Postprocessing:
-     Temperature min/avg/max: 1000 K, 1001 K, 1001 K
+     Temperature min/avg/max:                1000 K, 1001 K, 1001 K
+     Internal heating rate (average/total):  1 W/kg, 3.4e+15 W
 
 Termination requested by criterion: end time
 
 
 +---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start    |      12.1s |            |
+| Total wallclock time elapsed since start    |      7.94s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
 +---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         2 |      4.18s |        35% |
-| Assemble temperature system     |         2 |      1.63s |        14% |
-| Build Stokes preconditioner     |         2 |      2.98s |        25% |
-| Build temperature preconditioner|         2 |    0.0214s |      0.18% |
-| Solve Stokes system             |         2 |     0.267s |       2.2% |
-| Solve temperature system        |         2 |   0.00896s |     0.074% |
-| Initialization                  |         2 |     0.742s |       6.2% |
-| Postprocessing                  |         2 |    0.0935s |      0.78% |
-| Setup dof systems               |         1 |     0.773s |       6.4% |
+| Assemble Stokes system          |         2 |      2.58s |        32% |
+| Assemble temperature system     |         2 |      1.25s |        16% |
+| Build Stokes preconditioner     |         2 |      1.76s |        22% |
+| Build temperature preconditioner|         2 |    0.0245s |      0.31% |
+| Solve Stokes system             |         2 |     0.172s |       2.2% |
+| Solve temperature system        |         2 |    0.0125s |      0.16% |
+| Initialization                  |         2 |     0.447s |       5.6% |
+| Postprocessing                  |         2 |     0.159s |         2% |
+| Setup dof systems               |         1 |     0.626s |       7.9% |
 +---------------------------------+-----------+------------+------------+
 
diff --git a/tests/radiogenic_heating/statistics b/tests/internal_heating_statistics/statistics
similarity index 73%
copy from tests/radiogenic_heating/statistics
copy to tests/internal_heating_statistics/statistics
index c8bda79..1e607a9 100644
--- a/tests/radiogenic_heating/statistics
+++ b/tests/internal_heating_statistics/statistics
@@ -11,5 +11,7 @@
 # 11: Minimal temperature (K)
 # 12: Average temperature (K)
 # 13: Maximal temperature (K)
-0 0.0000e+00 1024 9539 4225 0 25 26 26 1.0000e+03 1.00000000e+03 1.00000000e+03 1.00000000e+03 
-1 1.0000e+03 1024 9539 4225 9  0  0  0 1.5625e+04 1.00000000e+03 1.00099578e+03 1.00110647e+03 
+# 14: Average internal heating rate (W/kg) 
+# 15: Total internal heating rate (W) 
+0 0.0000e+00 1024 9539 4225 0 25 26 26 1.0000e+03 1.00000000e+03 1.00000000e+03 1.00000000e+03 1.00000000e+00 3.40000000e+15 
+1 1.0000e+03 1024 9539 4225 9  0  0  0 1.5625e+04 1.00000000e+03 1.00099578e+03 1.00110647e+03 1.00000000e+00 3.40000000e+15