[cig-commits] commit 2345 by heien to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 2345

Fixed non-dimensional temperature calculation

U   trunk/aspect/doc/modules/changes.h
U   trunk/aspect/source/postprocess/temperature_statistics.cc


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2345&peg=2345

Diff:
Modified: trunk/aspect/doc/modules/changes.h
===================================================================
--- trunk/aspect/doc/modules/changes.h	2014-03-25 14:05:43 UTC (rev 2344)
+++ trunk/aspect/doc/modules/changes.h	2014-03-26 01:14:38 UTC (rev 2345)
@@ -8,6 +8,10 @@
 </p>
 
 <ol>
+  <li>Fixed: Corrected calculation of non-dimensional temperature.
+  <br>
+  (Eric Heien, 2014/03/24)
+
   <li>Fixed: Restarting from a previously checkpointed solution
   did not work when using the Intel compiler and its standard library.
   This is now fixed.

Modified: trunk/aspect/source/postprocess/temperature_statistics.cc
===================================================================
--- trunk/aspect/source/postprocess/temperature_statistics.cc	2014-03-25 14:05:43 UTC (rev 2344)
+++ trunk/aspect/source/postprocess/temperature_statistics.cc	2014-03-26 01:14:38 UTC (rev 2345)
@@ -114,10 +114,11 @@
         global_max_temperature = global_values[1];
       }
 
+      double global_mean_temperature = global_temperature_integral / this->get_volume();
       statistics.add_value ("Minimal temperature (K)",
                             global_min_temperature);
       statistics.add_value ("Average temperature (K)",
-                            global_temperature_integral / this->get_volume());
+                            global_mean_temperature);
       statistics.add_value ("Maximal temperature (K)",
                             global_max_temperature);
       if ((this->get_fixed_temperature_boundary_indicators().size() > 0)
@@ -126,7 +127,7 @@
            !=
            this->get_boundary_temperature().minimal_temperature(this->get_fixed_temperature_boundary_indicators())))
         statistics.add_value ("Average nondimensional temperature (K)",
-                              global_temperature_integral / this->get_volume() /
+                              (global_mean_temperature - global_min_temperature) /
                               (this->get_boundary_temperature().maximal_temperature(this->get_fixed_temperature_boundary_indicators())
                                -
                                this->get_boundary_temperature().minimal_temperature(this->get_fixed_temperature_boundary_indicators())));