[cig-commits] commit 2269 by bangerth to /var/svn/dealii/aspect
dealii.demon at gmail.com
dealii.demon at gmail.com
Sun Jan 12 10:49:34 PST 2014
Revision 2269
Add the van Keken benchmark.
U trunk/aspect/cookbooks/van-keken-discontinuous.prm
A trunk/aspect/cookbooks/van-keken-smooth.prm
A trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/
A trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/mesh-comparison-initial-conditions.png
A trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/mesh-comparison.png
A trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0000.png
A trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0003.png
A trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0009.png
A trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0018.png
A trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/velocity-discontinuous.png
A trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/velocity-smooth.png
U trunk/aspect/doc/manual/manual.bib
U trunk/aspect/doc/manual/manual.tex
U trunk/aspect/doc/manual.pdf
U trunk/aspect/doc/modules/changes.h
http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2269&peg=2269
Diff:
Modified: trunk/aspect/cookbooks/van-keken-discontinuous.prm
===================================================================
--- trunk/aspect/cookbooks/van-keken-discontinuous.prm 2014-01-10 23:55:36 UTC (rev 2268)
+++ trunk/aspect/cookbooks/van-keken-discontinuous.prm 2014-01-12 18:49:23 UTC (rev 2269)
@@ -1,7 +1,6 @@
-# van keken benchmark, work in progress
+# A description of the van Keken et al. benchmark. See the manual for more
+# information.
-############### Global parameters
-
set Dimension = 2
set Start time = 0
set End time = 2000
@@ -19,11 +18,12 @@
subsection Model settings
set Include adiabatic heating = false
- set Include shear heating = false # default: true
- set Tangential velocity boundary indicators = 0,1
- set Zero velocity boundary indicators = 2,3
+ set Include shear heating = false
+ set Tangential velocity boundary indicators = 0,1 # left and right
+ set Zero velocity boundary indicators = 2,3 # bottom and top
end
+
subsection Material model
set Model name = simple
subsection Simple model
@@ -42,6 +42,7 @@
############### Parameters describing the temperature field
+# Note: The temperature plays no role in this model
subsection Boundary temperature model
set Model name = box
@@ -50,14 +51,14 @@
subsection Initial conditions
set Model name = function
subsection Function
- set Variable names = x,z
- set Function constants = pi=3.14159
- set Function expression = if( (z>0.2+0.02*cos(pi*x/0.9142)) , 0 , 1 )
+ set Function expression = 0
end
end
############### Parameters describing the compositional field
+# Note: The compositional field is what drives the flow
+# in this example
subsection Compositional fields
set Number of fields = 1
@@ -67,7 +68,7 @@
set Model name = function
subsection Function
set Variable names = x,z
- set Function constants = pi=3.14159
+ set Function constants = pi=3.1415926
set Function expression = if( (z>0.2+0.02*cos(pi*x/0.9142)) , 0 , 1 )
end
end
@@ -78,6 +79,7 @@
end
end
+
############### Parameters describing the discretization
subsection Mesh refinement
@@ -90,22 +92,12 @@
end
-##subsection Discretization
-## set Composition polynomial degree = 2
-## subsection Stabilization parameters
-## set beta = 0.5
-## set cR = 1e15
-## end
-## end
+############### Parameters describing what to do with the solution
-
-############### Parameters describing the what to do with the solution
-
subsection Postprocess
set List of postprocessors = visualization, velocity statistics, composition statistics
subsection Visualization
- set List of output variables = all
set Output format = vtu
set Time between graphical output = 100
end
Copied: trunk/aspect/cookbooks/van-keken-smooth.prm (from rev 2268, trunk/aspect/cookbooks/van-keken-discontinuous.prm)
===================================================================
--- trunk/aspect/cookbooks/van-keken-smooth.prm (rev 0)
+++ trunk/aspect/cookbooks/van-keken-smooth.prm 2014-01-12 18:49:23 UTC (rev 2269)
@@ -0,0 +1,105 @@
+# A description of the van Keken et al. benchmark using smooth initial
+# conditions instead of the discontinuous ones in
+# van-keken-discontinuous.prm. See the manual for more information.
+
+set Dimension = 2
+set Start time = 0
+set End time = 2000
+set Use years in output instead of seconds = false
+set CFL number = 1.0
+set Output directory = output
+
+subsection Geometry model
+ set Model name = box
+ subsection Box
+ set X extent = 0.9142
+ set Y extent = 1.0000
+ end
+end
+
+subsection Model settings
+ set Include adiabatic heating = false
+ set Include shear heating = false
+ set Tangential velocity boundary indicators = 0,1 # left and right
+ set Zero velocity boundary indicators = 2,3 # bottom and top
+end
+
+
+subsection Material model
+ set Model name = simple
+ subsection Simple model
+ set Reference density = 1010
+ set Viscosity = 1e2
+ set Thermal expansion coefficient = 0
+ end
+end
+
+subsection Gravity model
+ set Model name = vertical
+ subsection Vertical
+ set Magnitude = 10
+ end
+end
+
+
+############### Parameters describing the temperature field
+# Note: The temperature plays no role in this model
+
+subsection Boundary temperature model
+ set Model name = box
+end
+
+subsection Initial conditions
+ set Model name = function
+ subsection Function
+ set Function expression = 0
+ end
+end
+
+
+############### Parameters describing the compositional field
+# Note: The compositional field is what drives the flow
+# in this example
+
+subsection Compositional fields
+ set Number of fields = 1
+end
+
+subsection Compositional initial conditions
+ set Model name = function
+ subsection Function
+ set Variable names = x,z
+ set Function constants = pi=3.1415926
+ set Function expression = 0.5*(1+tanh((0.2+0.02*cos(pi*x/0.9142)-z)/0.02))
+ end
+end
+
+subsection Material model
+ subsection Simple model
+ set Density differential for compositional field 1 = -10
+ end
+end
+
+
+############### Parameters describing the discretization
+
+subsection Mesh refinement
+ set Initial adaptive refinement = 0
+ set Strategy = composition
+ set Initial global refinement = 7
+ set Time steps between mesh refinement = 0
+ set Coarsening fraction = 0.05
+ set Refinement fraction = 0.3
+end
+
+
+
+############### Parameters describing what to do with the solution
+
+subsection Postprocess
+ set List of postprocessors = visualization, velocity statistics, composition statistics
+ subsection Visualization
+ set Output format = vtu
+ set Time between graphical output = 100
+ end
+end
Added: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/mesh-comparison-initial-conditions.png
===================================================================
(Binary files differ)
Index: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/mesh-comparison-initial-conditions.png
===================================================================
--- trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/mesh-comparison-initial-conditions.png 2014-01-10 23:55:36 UTC (rev 2268)
+++ trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/mesh-comparison-initial-conditions.png 2014-01-12 18:49:23 UTC (rev 2269)
Property changes on: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/mesh-comparison-initial-conditions.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/mesh-comparison.png
===================================================================
(Binary files differ)
Index: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/mesh-comparison.png
===================================================================
--- trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/mesh-comparison.png 2014-01-10 23:55:36 UTC (rev 2268)
+++ trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/mesh-comparison.png 2014-01-12 18:49:23 UTC (rev 2269)
Property changes on: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/mesh-comparison.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0000.png
===================================================================
(Binary files differ)
Index: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0000.png
===================================================================
--- trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0000.png 2014-01-10 23:55:36 UTC (rev 2268)
+++ trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0000.png 2014-01-12 18:49:23 UTC (rev 2269)
Property changes on: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0000.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0003.png
===================================================================
(Binary files differ)
Index: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0003.png
===================================================================
--- trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0003.png 2014-01-10 23:55:36 UTC (rev 2268)
+++ trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0003.png 2014-01-12 18:49:23 UTC (rev 2269)
Property changes on: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0003.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0009.png
===================================================================
(Binary files differ)
Index: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0009.png
===================================================================
--- trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0009.png 2014-01-10 23:55:36 UTC (rev 2268)
+++ trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0009.png 2014-01-12 18:49:23 UTC (rev 2269)
Property changes on: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0009.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0018.png
===================================================================
(Binary files differ)
Index: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0018.png
===================================================================
--- trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0018.png 2014-01-10 23:55:36 UTC (rev 2268)
+++ trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0018.png 2014-01-12 18:49:23 UTC (rev 2269)
Property changes on: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/movie0018.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/velocity-discontinuous.png
===================================================================
(Binary files differ)
Index: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/velocity-discontinuous.png
===================================================================
--- trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/velocity-discontinuous.png 2014-01-10 23:55:36 UTC (rev 2268)
+++ trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/velocity-discontinuous.png 2014-01-12 18:49:23 UTC (rev 2269)
Property changes on: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/velocity-discontinuous.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/velocity-smooth.png
===================================================================
(Binary files differ)
Index: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/velocity-smooth.png
===================================================================
--- trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/velocity-smooth.png 2014-01-10 23:55:36 UTC (rev 2268)
+++ trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/velocity-smooth.png 2014-01-12 18:49:23 UTC (rev 2269)
Property changes on: trunk/aspect/doc/manual/cookbooks/benchmarks/van-keken/velocity-smooth.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Modified: trunk/aspect/doc/manual/manual.bib
===================================================================
--- trunk/aspect/doc/manual/manual.bib 2014-01-10 23:55:36 UTC (rev 2268)
+++ trunk/aspect/doc/manual/manual.bib 2014-01-12 18:49:23 UTC (rev 2269)
@@ -10781,3 +10781,12 @@
year={2003},
publisher={Wiley Online Library}
}
+
+ at Article{KKSCND97,
+ author = {P. E. van Keken and S. D. King and H. Schmeling and U. R. Christensen and D. Neumeister and M.-P. Doin},
+ title = {A comparison of methods for the modeling of thermochemical convection},
+ journal = {J. Geoph. Res.},
+ year = 1997,
+ volume = 102,
+ pages = {22477--22495}}
+
Modified: trunk/aspect/doc/manual/manual.tex
===================================================================
--- trunk/aspect/doc/manual/manual.tex 2014-01-10 23:55:36 UTC (rev 2268)
+++ trunk/aspect/doc/manual/manual.tex 2014-01-12 18:49:23 UTC (rev 2269)
@@ -83,7 +83,8 @@
Thomas Geenen,
Eric Heien,
Martin Kronbichler,
- Elvira Mulyukova
+ Elvira Mulyukova,
+ Cedric Thieulot
}
@@ -3378,7 +3379,7 @@
\includegraphics[width=0.3 extwidth]{cookbooks/platelike-boundary/visit0005.png}
\hfill
\includegraphics[width=0.3 extwidth]{cookbooks/platelike-boundary/visit0006.png}
-
More information about the CIG-COMMITS
mailing list