[cig-commits] commit 2301 by bangerth to /var/svn/dealii/aspect
dealii.demon at gmail.com
dealii.demon at gmail.com
Fri Feb 14 15:30:05 PST 2014
Revision 2301
Add another test.
U trunk/aspect/doc/modules/changes.h
A trunk/aspect/tests/depth_average_03/
U trunk/aspect/tests/depth_average_03/depthaverage.plt
A trunk/aspect/tests/depth_average_03.prm
http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2301&peg=2301
Diff:
Modified: trunk/aspect/doc/modules/changes.h
===================================================================
--- trunk/aspect/doc/modules/changes.h 2014-02-14 23:13:14 UTC (rev 2300)
+++ trunk/aspect/doc/modules/changes.h 2014-02-14 23:30:01 UTC (rev 2301)
@@ -13,11 +13,12 @@
file that specifies into how many depth slices the domain should
be subdivided in computing depth averages.
<br>
- (Wolfgang Bangerth 2014/02/11)
+ (Wolfgang Bangerth 2014/02/14)
<li>Fixed: The "depth average" postprocessor did not honor the
"Use years in output instead of seconds" parameter in the input
- file and instead always printed time in seconds. This is now fixed.
+ file and instead always printed time in seconds when generating
+ output. This is now fixed.
<br>
(Wolfgang Bangerth 2014/02/11)
Modified: trunk/aspect/tests/depth_average_03/depthaverage.plt
===================================================================
--- trunk/aspect/tests/depth_average_02/depthaverage.plt 2014-02-14 23:12:34 UTC (rev 2299)
+++ trunk/aspect/tests/depth_average_03/depthaverage.plt 2014-02-14 23:30:01 UTC (rev 2301)
@@ -1,31 +1,11 @@
# time, depth, avg T, adiabatic T, velocity magnitude, avg sinking velocity, avg Vs, avg Vp, avg viscosity
-0.000000e+00 0.000000e+00 1.250000e-01 0.000000e+00 3.198893e+00 9.489697e+06 -1.000000e+00 -1.000000e+00 1.000000e+00
-0.000000e+00 2.500000e-01 3.750000e-01 0.000000e+00 3.199009e+00 2.290983e+07 -1.000000e+00 -1.000000e+00 1.000000e+00
-0.000000e+00 5.000000e-01 6.250000e-01 0.000000e+00 3.199307e+00 2.290826e+07 -1.000000e+00 -1.000000e+00 1.000000e+00
-0.000000e+00 7.500000e-01 8.750000e-01 0.000000e+00 3.195970e+00 9.484446e+06 -1.000000e+00 -1.000000e+00 1.000000e+00
+0.000000e+00 0.000000e+00 1.250000e-01 0.000000e+00 3.199701e-18 9.490996e-03 -1.000000e+00 -1.000000e+00 1.000000e+09
+0.000000e+00 2.500000e-01 3.750000e-01 0.000000e+00 3.199487e-18 2.291207e-02 -1.000000e+00 -1.000000e+00 1.000000e+09
+0.000000e+00 5.000000e-01 6.250000e-01 0.000000e+00 3.199757e-18 2.290925e-02 -1.000000e+00 -1.000000e+00 1.000000e+09
+0.000000e+00 7.500000e-01 8.750000e-01 0.000000e+00 3.196124e-18 9.484816e-03 -1.000000e+00 -1.000000e+00 1.000000e+09
-1.001872e-01 0.000000e+00 3.515922e-01 0.000000e+00 2.760723e+03 2.750965e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-1.001872e-01 2.500000e-01 5.221921e-01 0.000000e+00 2.595063e+03 6.399636e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-1.001872e-01 5.000000e-01 4.778034e-01 0.000000e+00 2.595070e+03 6.400691e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-1.001872e-01 7.500000e-01 6.484054e-01 0.000000e+00 2.760638e+03 2.752029e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
+1.000000e+01 0.000000e+00 1.250000e-01 0.000000e+00 1.288893e-24 5.984454e-06 -1.000000e+00 -1.000000e+00 1.000000e+09
+1.000000e+01 2.500000e-01 3.750000e-01 0.000000e+00 2.124640e-24 1.537288e-05 -1.000000e+00 -1.000000e+00 1.000000e+09
+1.000000e+01 5.000000e-01 6.250000e-01 0.000000e+00 3.435672e-24 1.468604e-05 -1.000000e+00 -1.000000e+00 1.000000e+09
+1.000000e+01 7.500000e-01 8.750000e-01 0.000000e+00 3.913697e-24 1.734654e-05 -1.000000e+00 -1.000000e+00 1.000000e+09
-2.011033e-01 0.000000e+00 3.507789e-01 0.000000e+00 2.654189e+03 2.696602e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-2.011033e-01 2.500000e-01 5.222028e-01 0.000000e+00 2.493281e+03 6.268357e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-2.011033e-01 5.000000e-01 4.777968e-01 0.000000e+00 2.493287e+03 6.269413e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-2.011033e-01 7.500000e-01 6.492208e-01 0.000000e+00 2.654114e+03 2.697671e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-
-3.004368e-01 0.000000e+00 3.507797e-01 0.000000e+00 2.654148e+03 2.696580e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-3.004368e-01 2.500000e-01 5.222036e-01 0.000000e+00 2.493244e+03 6.268301e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-3.004368e-01 5.000000e-01 4.777967e-01 0.000000e+00 2.493250e+03 6.269363e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-3.004368e-01 7.500000e-01 6.492203e-01 0.000000e+00 2.654078e+03 2.697651e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-
-4.014258e-01 0.000000e+00 3.507798e-01 0.000000e+00 2.654204e+03 2.696599e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-4.014258e-01 2.500000e-01 5.222039e-01 0.000000e+00 2.493312e+03 6.268370e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-4.014258e-01 5.000000e-01 4.777970e-01 0.000000e+00 2.493322e+03 6.269455e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-4.014258e-01 7.500000e-01 6.492199e-01 0.000000e+00 2.654164e+03 2.697697e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-
-5.000000e-01 0.000000e+00 3.507798e-01 0.000000e+00 2.654178e+03 2.696589e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-5.000000e-01 2.500000e-01 5.222038e-01 0.000000e+00 2.493281e+03 6.268343e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-5.000000e-01 5.000000e-01 4.777969e-01 0.000000e+00 2.493284e+03 6.269411e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-5.000000e-01 7.500000e-01 6.492204e-01 0.000000e+00 2.654105e+03 2.697663e+08 -1.000000e+00 -1.000000e+00 1.000000e+00
-
Copied: trunk/aspect/tests/depth_average_03.prm (from rev 2299, trunk/aspect/tests/depth_average_02.prm)
===================================================================
--- trunk/aspect/tests/depth_average_03.prm (rev 0)
+++ trunk/aspect/tests/depth_average_03.prm 2014-02-14 23:30:01 UTC (rev 2301)
@@ -0,0 +1,117 @@
+# Like the _02 test, but create output in years. At one point I
+# believed that this was previously ignored (despite assurances in the
+# manual) but it turned out to work nevertheless. Anyway, it's good to
+# have a test.
+
+set Dimension = 2
+
+set Use years in output instead of seconds = false
+set End time = 10 # but note the very low viscosity
+set Use years in output instead of seconds = true
+set Output directory = output
+
+set Linear solver tolerance = 1e-15
+set Temperature solver tolerance = 1e-15
+
+set Pressure normalization = surface
+set Surface pressure = 0
+
+
+subsection Geometry model
+ set Model name = box
+
+ subsection Box
+ set X extent = 1
+ set Y extent = 1
+ end
+end
+
+
+subsection Initial conditions
+ set Model name = function
+
+ subsection Function
+ set Variable names = x,z
+ set Function constants = p=0.01, L=1, pi=3.1415926536, k=1
+ set Function expression = (1.0-z) - p*cos(k*pi*x/L)*sin(pi*z)
+ end
+end
+
+
+subsection Boundary temperature model
+ set Model name = box
+
+ subsection Box
+ set Bottom temperature = 1
+ set Left temperature = 0
+ set Right temperature = 0
+ set Top temperature = 0
+ end
+end
+
+
+subsection Model settings
+ set Fixed temperature boundary indicators = 2,3
+
+ # The next parameters then describe on which parts of the
+ # boundary we prescribe a zero or nonzero velocity and
+ # on which parts the flow is allowed to be tangential.
+ # Here, all four sides of the box allow tangential
+ # unrestricted flow but with a zero normal component:
+ set Zero velocity boundary indicators =
+ set Prescribed velocity boundary indicators =
+ set Tangential velocity boundary indicators = 0,1,2,3
+
+ # The final part of this section describes whether we
+ # want to include adiabatic heating (from a small
+ # compressibility of the medium) or from shear friction,
+ # as well as the rate of internal heating. We do not
+ # want to use any of these options here:
+ set Include adiabatic heating = false
+ set Include shear heating = false
+ set Radiogenic heating rate = 0
+end
+
+
+subsection Gravity model
+ set Model name = vertical
+
+ subsection Vertical
+ set Magnitude = 1e14 # = Ra / Thermal expansion coefficient
+ end
+end
+
+
+subsection Material model
+ set Model name = simple # default:
+
+ subsection Simple model
+ set Reference density = 1
+ set Reference specific heat = 1
+ set Reference temperature = 0
+ set Thermal conductivity = 1
+ set Thermal expansion coefficient = 1e-10
+ set Viscosity = 1e+9
+ end
+end
+
+
+subsection Mesh refinement
+ set Initial global refinement = 2
+ set Initial adaptive refinement = 0
+ set Time steps between mesh refinement = 0
+end
+
+
+subsection Postprocess
+ set List of postprocessors = depth average
+
+ subsection Depth average
+ # output every 5 years (noting that 'Use years in
+ # output instead of seconds' is set). For the current
+ # model, this means twice
+ set Time between graphical output = 5
+ set Number of zones = 4
+ end
+end
+
More information about the CIG-COMMITS
mailing list