[cig-commits] commit 2415 by heister to /var/svn/dealii/aspect
dealii.demon at gmail.com
dealii.demon at gmail.com
Sun Apr 6 18:02:40 PDT 2014
Revision 2415
merge from mainline
_U branches/freesurface/
U branches/freesurface/CMakeLists.txt
A branches/freesurface/cookbooks/future/netrot.prm
A branches/freesurface/cookbooks/future/nettranslation.prm
U branches/freesurface/cookbooks/future/periodic_box.prm
A branches/freesurface/cookbooks/gplates-2d.prm
D branches/freesurface/cookbooks/gplates_2d.prm
U branches/freesurface/doc/manual/manual.tex
U branches/freesurface/doc/manual.pdf
U branches/freesurface/doc/modules/changes.h
U branches/freesurface/include/aspect/simulator.h
U branches/freesurface/include/aspect/velocity_boundary_conditions/function.h
U branches/freesurface/source/postprocess/dynamic_topography.cc
U branches/freesurface/source/postprocess/visualization/dynamic_topography.cc
U branches/freesurface/source/simulator/core.cc
U branches/freesurface/source/simulator/helper_functions.cc
U branches/freesurface/source/simulator/initial_conditions.cc
A branches/freesurface/source/simulator/nullspace.cc
U branches/freesurface/source/simulator/parameters.cc
U branches/freesurface/source/simulator/solver.cc
U branches/freesurface/source/velocity_boundary_conditions/function.cc
U branches/freesurface/source/velocity_boundary_conditions/gplates.cc
http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2415&peg=2415
Diff:
Index: branches/freesurface
===================================================================
--- branches/freesurface 2014-04-07 00:55:17 UTC (rev 2414)
+++ branches/freesurface 2014-04-07 01:02:37 UTC (rev 2415)
Property changes on: branches/freesurface
___________________________________________________________________
Modified: svn:mergeinfo
## -2,3 +2,4 ##
/branches/compositional:1141-1251
/branches/fully-nonlinear:542-728
/branches/j-dannberg:1679,1875-1882
+/trunk/aspect:2386-2414
\ No newline at end of property
Modified: branches/freesurface/CMakeLists.txt
===================================================================
--- branches/freesurface/CMakeLists.txt 2014-04-07 00:55:17 UTC (rev 2414)
+++ branches/freesurface/CMakeLists.txt 2014-04-07 01:02:37 UTC (rev 2415)
@@ -63,6 +63,15 @@
PROJECT(${TARGET})
+# Pass down the source directory to the sources. This can be used
+# to hard-code the location of data files, such as in
+# $ASPECT_SOURCE_DIR/data/velocity-boundary-conditions/gplates/*
+FOREACH(_source_file ${TARGET_SRC})
+ SET_PROPERTY(SOURCE ${_source_file}
+ APPEND PROPERTY COMPILE_DEFINITIONS ASPECT_SOURCE_DIR="${CMAKE_SOURCE_DIR}")
+ENDFOREACH()
+
+
# Configure a cmake fragment that plugins can use to
# set up compiler flags, include paths, etc to compile an
# Aspect plugin
Copied: branches/freesurface/cookbooks/future/netrot.prm (from rev 2414, trunk/aspect/cookbooks/future/netrot.prm)
===================================================================
--- branches/freesurface/cookbooks/future/netrot.prm (rev 0)
+++ branches/freesurface/cookbooks/future/netrot.prm 2014-04-07 01:02:37 UTC (rev 2415)
@@ -0,0 +1,85 @@
+# A simple setup for convection in a quarter of a 2d shell. See the
+# manual for more information.
+
+
+set Dimension = 2
+set Use years in output instead of seconds = true
+set End time = 1.5e9
+set Output directory = output
+
+
+subsection Material model
+ set Model name = simple
+
+ subsection Simple model
+ set Thermal expansion coefficient = 4e-5
+ set Viscosity = 1e20
+ end
+end
+
+
+subsection Geometry model
+ set Model name = spherical shell
+
+ subsection Spherical shell
+ set Inner radius = 3481000
+ set Outer radius = 6336000
+ set Opening angle = 360
+ end
+end
+
+
+subsection Model settings
+ set Zero velocity boundary indicators =
+ set Tangential velocity boundary indicators = 0,1
+ set Prescribed velocity boundary indicators =
+
+ set Fixed temperature boundary indicators = 0,1
+
+ set Include shear heating = true
+
+ # net rotation|net translation|angular momentum|translational momentum
+ set Remove nullspace = net rotation
+end
+
+
+subsection Boundary temperature model
+ set Model name = spherical constant
+ subsection Spherical constant
+ set Inner temperature = 4273
+ set Outer temperature = 973
+ end
+end
+
+
+subsection Initial conditions
+ set Model name = spherical hexagonal perturbation
+end
+
+
+subsection Gravity model
+ set Model name = radial earth-like
+end
+
+
+subsection Mesh refinement
+ set Initial global refinement = 4
+ set Initial adaptive refinement = 0
+ set Strategy = temperature
+ set Time steps between mesh refinement = 5
+end
+
+
+subsection Postprocess
+ set List of postprocessors = visualization, velocity statistics, temperature statistics, heat flux statistics, depth average
+
+ subsection Visualization
+ set Output format = vtu
+ set Time between graphical output = 1
+ set Number of grouped files = 0
+ end
+
+ subsection Depth average
+ set Time between graphical output = 1e6
+ end
+end
Copied: branches/freesurface/cookbooks/future/nettranslation.prm (from rev 2414, trunk/aspect/cookbooks/future/nettranslation.prm)
===================================================================
--- branches/freesurface/cookbooks/future/nettranslation.prm (rev 0)
+++ branches/freesurface/cookbooks/future/nettranslation.prm 2014-04-07 01:02:37 UTC (rev 2415)
@@ -0,0 +1,106 @@
+set Dimension = 2
+set CFL number = 1.0
+set End time = 1e9
+set Output directory = output
+set Resume computation = false
+set Start time = 0
+set Adiabatic surface temperature = 0
+set Surface pressure = 0
+set Pressure normalization = no
+set Linear solver tolerance = 1.e-7
+set Use years in output instead of seconds = true
+set Nonlinear solver scheme = IMPES
+
+subsection Boundary temperature model
+ set Model name = box
+ subsection Box
+ set Top temperature = 0.0
+ set Bottom temperature = 1000.0
+ end
+end
+
+
+subsection Discretization
+ set Stokes velocity polynomial degree = 2
+ set Temperature polynomial degree = 2
+ set Use locally conservative discretization = false
+ subsection Stabilization parameters
+ set alpha = 2
+ set beta = 0.078
+ set cR = 0.5 # default: 0.11
+ end
+end
+
+
+subsection Geometry model
+ set Model name = box
+ subsection Box
+ set X periodic = true
+ set X extent = 1.e6
+ set Y extent = 5.e5
+ set Z extent = 5.e5
+ end
+end
+
+
+subsection Gravity model
+ set Model name = vertical
+ subsection Vertical
+ set Magnitude = 10.0
+ end
+end
+
+
+subsection Initial conditions
+ set Model name = function
+ subsection Function
+ set Variable names = x,y
+ set Function expression = if((sqrt((x-1.e5)^2+(y-4.0e5)^2)<5.0e4) | (sqrt((x-3.e5)^2+(y-2.e5)^2)<1.0e5) , 800.0, 0)
+ end
+end
+
+
+subsection Material model
+ set Model name = simple
+ subsection Simple model
+ set Reference density = 3300
+ set Reference specific heat = 1250
+ set Reference temperature = 0.0
+ set Thermal conductivity = 4.7
+ set Thermal expansion coefficient = 4e-5
+ set Viscosity = 1.e20
+ end
+end
+
+
+subsection Mesh refinement
+ set Additional refinement times =
+ set Initial adaptive refinement = 2 # default: 2
+ set Initial global refinement = 6 # default: 2
+ set Refinement fraction = 0.3
+ set Coarsening fraction = 0.03
+ set Strategy = thermal energy density
+ set Time steps between mesh refinement = 10 # default: 10
+end
+
+
+subsection Model settings
+ set Include adiabatic heating = false
+ set Include shear heating = false
+ set Radiogenic heating rate = 0
+ set Fixed temperature boundary indicators = 2,3
+ set Prescribed velocity boundary indicators =
+ set Tangential velocity boundary indicators = 2,3
+ set Zero velocity boundary indicators =
+ set Remove nullspace = net translation
+end
+
+subsection Postprocess
+ set List of postprocessors = visualization
+ subsection Visualization
+ set List of output variables =
+ set Number of grouped files = 1
+ set Output format = vtu
+ set Time between graphical output = 1.e3
+ end
+end
Modified: branches/freesurface/cookbooks/future/periodic_box.prm
===================================================================
--- branches/freesurface/cookbooks/future/periodic_box.prm 2014-04-07 00:55:17 UTC (rev 2414)
+++ branches/freesurface/cookbooks/future/periodic_box.prm 2014-04-07 01:02:37 UTC (rev 2415)
@@ -90,8 +90,9 @@
set Radiogenic heating rate = 0
set Fixed temperature boundary indicators = 2,3
set Prescribed velocity boundary indicators =
- set Tangential velocity boundary indicators =
- set Zero velocity boundary indicators = 2,3
+ set Tangential velocity boundary indicators = 2,3
+ set Zero velocity boundary indicators =
+ set Remove nullspace = net translation
end
subsection Postprocess
@@ -100,6 +101,6 @@
set List of output variables =
set Number of grouped files = 1
set Output format = vtu
- set Time between graphical output = 1.e5
+ set Time between graphical output = 1.e3
end
end
Copied: branches/freesurface/cookbooks/gplates-2d.prm (from rev 2414, trunk/aspect/cookbooks/gplates-2d.prm)
===================================================================
--- branches/freesurface/cookbooks/gplates-2d.prm (rev 0)
+++ branches/freesurface/cookbooks/gplates-2d.prm 2014-04-07 01:02:37 UTC (rev 2415)
@@ -0,0 +1,102 @@
+# A simple setup for for using the GPlates interface in a 2d shell. See the
+# manual for more information.
+
+set Dimension = 2
+set Use years in output instead of seconds = true
+set End time = 3e8
+set Output directory = output
+set Adiabatic surface temperature = 1600
+
+
+subsection Material model
+ set Model name = simple
+
+ subsection Simple model
+ set Viscosity = 1e22
+ set Thermal viscosity exponent = 5.0
+ set Reference temperature = 1600
+ end
+end
+
+
+subsection Geometry model
+ set Model name = spherical shell
+
+ subsection Spherical shell
+ set Inner radius = 3481000
+ set Outer radius = 6336000
+ end
+end
+
+
+subsection Model settings
+ set Prescribed velocity boundary indicators = 1:gplates
+ set Tangential velocity boundary indicators = 0
+ set Prescribed velocity boundary indicators =
+
+ set Fixed temperature boundary indicators = 0,1
+
+ set Include shear heating = false
+end
+
+
+subsection Boundary velocity model
+ subsection GPlates model
+ set Data directory = $ASPECT_SOURCE_DIR/data/velocity-boundary-conditions/gplates/
+ set Velocity file name = current_day.gpml
+ set Time step = 1e6
+ set Point one = 1.5708,4.87
+ set Point two = 1.5708,5.24
+ set Interpolation width = 2000000
+ end
+end
+
+
+subsection Boundary temperature model
+ set Model name = spherical constant
+ subsection Spherical constant
+ set Inner temperature = 2600
+ set Outer temperature = 273
+ end
+end
+
+
+subsection Initial conditions
+ set Model name = adiabatic
+
+ subsection Function
+ set Age top boundary layer = 5e7
+ end
+end
+
+
+subsection Gravity model
+ set Model name = radial constant
+
+ subsection Radial constant
+ set Magnitude = 10
+ end
+end
+
+
+subsection Mesh refinement
+ set Initial adaptive refinement = 1
+ set Initial global refinement = 5
+ set Strategy = temperature
+ set Time steps between mesh refinement = 2
+end
+
+
+subsection Postprocess
+ set List of postprocessors = visualization, velocity statistics, temperature statistics, heat flux statistics, depth average
+
+ subsection Visualization
+ set Output format = vtu
+ set Time between graphical output = 1e6
+ set Number of grouped files = 0
+ end
+
+ subsection Depth average
+ set Time between graphical output = 1e6
+ end
+end
Modified: branches/freesurface/doc/manual/manual.tex
===================================================================
--- branches/freesurface/doc/manual/manual.tex 2014-04-07 00:55:17 UTC (rev 2414)
+++ branches/freesurface/doc/manual/manual.tex 2014-04-07 01:02:37 UTC (rev 2415)
@@ -266,7 +266,6 @@
\
\label{eq:temperature}
ho C_p \left( rac{\partial T}{\partial t} + \mathbf u
More information about the CIG-COMMITS
mailing list