[cig-commits] commit 2333 by gassmoeller to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 2333

Update initial_conditions/adiabatic to use a constant background temperature if adiabatic heating is disabled.
Update test configurations accordingly.

U   trunk/aspect/source/initial_conditions/adiabatic.cc
U   trunk/aspect/tests/adiabatic_initial_conditions.prm
U   trunk/aspect/tests/adiabatic_initial_conditions_subadiabaticity.prm


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

Diff:
Modified: trunk/aspect/source/initial_conditions/adiabatic.cc
===================================================================
--- trunk/aspect/source/initial_conditions/adiabatic.cc	2014-03-10 21:00:23 UTC (rev 2332)
+++ trunk/aspect/source/initial_conditions/adiabatic.cc	2014-03-11 14:22:19 UTC (rev 2333)
@@ -145,9 +145,17 @@
       if (nondimesional_depth > 0)
         subadiabatic_T = -subadiabaticity * nondimesional_depth * nondimesional_depth;
 
+      // If adiabatic heating is disabled, apply all perturbations to
+      // constant adiabatic surface temperature instead of adiabatic profile.
+      const double temperature_profile = (this->include_adiabatic_heating()) 
+                      ? 
+                      this->adiabatic_conditions->temperature(position) 
+                      :
+                      adiabatic_surface_temperature;
+
       // return sum of the adiabatic profile, the boundary layer temperatures and the initial
-      // temperature perturbation
-      return this->adiabatic_conditions->temperature(position) + surface_cooling_temperature
+      // temperature perturbation. 
+      return temperature_profile + surface_cooling_temperature
              + (perturbation > 0.0 ? std::max(bottom_heating_temperature + subadiabatic_T,perturbation)
                 : bottom_heating_temperature + subadiabatic_T);
     }

Modified: trunk/aspect/tests/adiabatic_initial_conditions.prm
===================================================================
--- trunk/aspect/tests/adiabatic_initial_conditions.prm	2014-03-10 21:00:23 UTC (rev 2332)
+++ trunk/aspect/tests/adiabatic_initial_conditions.prm	2014-03-11 14:22:19 UTC (rev 2333)
@@ -86,6 +86,7 @@
   set Prescribed velocity boundary indicators =
   set Tangential velocity boundary indicators = 0, 2, 3
   set Zero velocity boundary indicators       = 1
+  set Include adiabatic heating               = true
 end
 
 subsection Postprocess

Modified: trunk/aspect/tests/adiabatic_initial_conditions_subadiabaticity.prm
===================================================================
--- trunk/aspect/tests/adiabatic_initial_conditions_subadiabaticity.prm	2014-03-10 21:00:23 UTC (rev 2332)
+++ trunk/aspect/tests/adiabatic_initial_conditions_subadiabaticity.prm	2014-03-11 14:22:19 UTC (rev 2333)
@@ -86,6 +86,7 @@
   set Prescribed velocity boundary indicators =
   set Tangential velocity boundary indicators = 0, 2, 3
   set Zero velocity boundary indicators       = 1
+  set Include adiabatic heating               = true
 end
 
 subsection Postprocess