[cig-commits] [commit] master: Add forgotten files. (5089975)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Aug 29 08:33:55 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/449120eb5efbd20a34e046b56ed2f049cfa841c3...30ebdbf18265d5d129d98b6ca5f079916558687c
>---------------------------------------------------------------
commit 508997584d121b75eeab256caf6e70dff55531d0
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date: Fri Aug 29 09:03:37 2014 -0500
Add forgotten files.
>---------------------------------------------------------------
508997584d121b75eeab256caf6e70dff55531d0
.../benchmarks/davies_et_al/case-1.1.prm.out | 50 ++++++++++++++++++++++
.../benchmarks/davies_et_al/case-2.1.prm.out | 10 +++++
.../benchmarks/davies_et_al/case-2.2.prm.out | 11 +++++
.../benchmarks/davies_et_al/case-2.3.prm.out | 14 ++++++
4 files changed, 85 insertions(+)
diff --git a/doc/manual/cookbooks/benchmarks/davies_et_al/case-1.1.prm.out b/doc/manual/cookbooks/benchmarks/davies_et_al/case-1.1.prm.out
new file mode 100644
index 0000000..c6df435
--- /dev/null
+++ b/doc/manual/cookbooks/benchmarks/davies_et_al/case-1.1.prm.out
@@ -0,0 +1,50 @@
+############### Parameters describing the model
+
+subsection %%\hyperref[parameters:Geometry_20model]{Geometry model}%
+ set %%\hyperref[parameters:Geometry model/Model name]{Model name}% = spherical shell%% \index[prmindex]{Model name} \index[prmindexfull]{Geometry model!Model name} %
+ subsection %%\hyperref[parameters:Geometry_20model/Spherical_20shell]{Spherical shell}%
+ set %%\hyperref[parameters:Geometry model/Spherical shell/Inner radius]{Inner radius}% = 1.22%% \index[prmindex]{Inner radius} \index[prmindexfull]{Geometry model!Spherical shell!Inner radius} %
+ set %%\hyperref[parameters:Geometry model/Spherical shell/Opening angle]{Opening angle}% = 360%% \index[prmindex]{Opening angle} \index[prmindexfull]{Geometry model!Spherical shell!Opening angle} %
+ set %%\hyperref[parameters:Geometry model/Spherical shell/Outer radius]{Outer radius}% = 2.22 %% \index[prmindex]{Outer radius} \index[prmindexfull]{Geometry model!Spherical shell!Outer radius} %
+ end
+end
+
+# [...]
+
+subsection %%\hyperref[parameters:Material_20model]{Material model}%
+ set %%\hyperref[parameters:Material model/Model name]{Model name}% = simple%% \index[prmindex]{Model name} \index[prmindexfull]{Material model!Model name} %
+ subsection %%\hyperref[parameters:Material_20model/Simple_20model]{Simple model}%
+ set %%\hyperref[parameters:Material model/Simple model/Reference density]{Reference density}% = 1%% \index[prmindex]{Reference density} \index[prmindexfull]{Material model!Simple model!Reference density} %
+ set %%\hyperref[parameters:Material model/Simple model/Reference specific heat]{Reference specific heat}% = 1.%% \index[prmindex]{Reference specific heat} \index[prmindexfull]{Material model!Simple model!Reference specific heat} %
+ set %%\hyperref[parameters:Material model/Simple model/Reference temperature]{Reference temperature}% = 0%% \index[prmindex]{Reference temperature} \index[prmindexfull]{Material model!Simple model!Reference temperature} %
+ set %%\hyperref[parameters:Material model/Simple model/Thermal conductivity]{Thermal conductivity}% = 1%% \index[prmindex]{Thermal conductivity} \index[prmindexfull]{Material model!Simple model!Thermal conductivity} %
+ set %%\hyperref[parameters:Material model/Simple model/Thermal expansion coefficient]{Thermal expansion coefficient}% = 1e-6%% \index[prmindex]{Thermal expansion coefficient} \index[prmindexfull]{Material model!Simple model!Thermal expansion coefficient} %
+ set %%\hyperref[parameters:Material model/Simple model/Viscosity]{Viscosity}% = 1%% \index[prmindex]{Viscosity} \index[prmindexfull]{Material model!Simple model!Viscosity} %
+ end
+end
+
+
+############### Parameters describing the temperature field
+# Angular mode is set to 4 in order to match the number of
+# convective cells reported by Davies et al.
+
+subsection %%\hyperref[parameters:Initial_20conditions]{Initial conditions}%
+ set %%\hyperref[parameters:Initial conditions/Model name]{Model name}% = spherical hexagonal perturbation%% \index[prmindex]{Model name} \index[prmindexfull]{Initial conditions!Model name} %
+ subsection %%\hyperref[parameters:Initial_20conditions/Spherical_20hexagonal_20perturbation]{Spherical hexagonal perturbation}%
+ set %%\hyperref[parameters:Initial conditions/Spherical hexagonal perturbation/Angular mode]{Angular mode}% = 4%% \index[prmindex]{Angular mode} \index[prmindexfull]{Initial conditions!Spherical hexagonal perturbation!Angular mode} %
+ set %%\hyperref[parameters:Initial conditions/Spherical hexagonal perturbation/Rotation offset]{Rotation offset}% = 0%% \index[prmindex]{Rotation offset} \index[prmindexfull]{Initial conditions!Spherical hexagonal perturbation!Rotation offset} %
+ end
+end
+
+
+############### Prescribe the Rayleigh number as g*alpha
+# Here, Ra = 10^4 and alpha was chosen as 10^-6 above.
+subsection %%\hyperref[parameters:Gravity_20model]{Gravity model}%
+ set %%\hyperref[parameters:Gravity model/Model name]{Model name}% = radial constant %% \index[prmindex]{Model name} \index[prmindexfull]{Gravity model!Model name} %
+ subsection %%\hyperref[parameters:Gravity_20model/Radial_20constant]{Radial constant}%
+ set %%\hyperref[parameters:Gravity model/Radial constant/Magnitude]{Magnitude}% = 1e10%% \index[prmindex]{Magnitude} \index[prmindexfull]{Gravity model!Radial constant!Magnitude} %
+ end
+end
+
+
+# [...]
diff --git a/doc/manual/cookbooks/benchmarks/davies_et_al/case-2.1.prm.out b/doc/manual/cookbooks/benchmarks/davies_et_al/case-2.1.prm.out
new file mode 100644
index 0000000..8b1331e
--- /dev/null
+++ b/doc/manual/cookbooks/benchmarks/davies_et_al/case-2.1.prm.out
@@ -0,0 +1,10 @@
+subsection %%\hyperref[parameters:Model_20settings]{Model settings}%
+ set %%\hyperref[parameters:Model settings/Remove nullspace]{Remove nullspace}% = net rotation%% \index[prmindex]{Remove nullspace} \index[prmindexfull]{Model settings!Remove nullspace} %
+
+ set %%\hyperref[parameters:Model settings/Fixed temperature boundary indicators]{Fixed temperature boundary indicators}% = 0,1%% \index[prmindex]{Fixed temperature boundary indicators} \index[prmindexfull]{Model settings!Fixed temperature boundary indicators} %
+ set %%\hyperref[parameters:Model settings/Prescribed velocity boundary indicators]{Prescribed velocity boundary indicators}% = %% \index[prmindex]{Prescribed velocity boundary indicators} \index[prmindexfull]{Model settings!Prescribed velocity boundary indicators} %
+ set %%\hyperref[parameters:Model settings/Tangential velocity boundary indicators]{Tangential velocity boundary indicators}% = 0,1%% \index[prmindex]{Tangential velocity boundary indicators} \index[prmindexfull]{Model settings!Tangential velocity boundary indicators} %
+ set %%\hyperref[parameters:Model settings/Zero velocity boundary indicators]{Zero velocity boundary indicators}% = %% \index[prmindex]{Zero velocity boundary indicators} \index[prmindexfull]{Model settings!Zero velocity boundary indicators} %
+ set %%\hyperref[parameters:Model settings/Include adiabatic heating]{Include adiabatic heating}% = false%% \index[prmindex]{Include adiabatic heating} \index[prmindexfull]{Model settings!Include adiabatic heating} %
+ set %%\hyperref[parameters:Model settings/Include shear heating]{Include shear heating}% = false %% \index[prmindex]{Include shear heating} \index[prmindexfull]{Model settings!Include shear heating} %
+end
diff --git a/doc/manual/cookbooks/benchmarks/davies_et_al/case-2.2.prm.out b/doc/manual/cookbooks/benchmarks/davies_et_al/case-2.2.prm.out
new file mode 100644
index 0000000..a9d31b9
--- /dev/null
+++ b/doc/manual/cookbooks/benchmarks/davies_et_al/case-2.2.prm.out
@@ -0,0 +1,11 @@
+############### Global parameters
+# Case 2.2 begins with the final steady state solution of Case 2.1
+# "Resume computation" must be set to true, and "Output directory" must
+# point to the folder that contains the results of Case 2.1.
+
+set %%\hyperref[parameters:CFL number]{CFL number}% = 10%% \index[prmindex]{CFL number} \index[prmindexfull]{CFL number} %
+
+set %%\hyperref[parameters:End time]{End time}% = 3%% \index[prmindex]{End time} \index[prmindexfull]{End time} %
+set %%\hyperref[parameters:Output directory]{Output directory}% = output%% \index[prmindex]{Output directory} \index[prmindexfull]{Output directory} %
+
+set %%\hyperref[parameters:Resume computation]{Resume computation}% = true%% \index[prmindex]{Resume computation} \index[prmindexfull]{Resume computation} %
diff --git a/doc/manual/cookbooks/benchmarks/davies_et_al/case-2.3.prm.out b/doc/manual/cookbooks/benchmarks/davies_et_al/case-2.3.prm.out
new file mode 100644
index 0000000..80849be
--- /dev/null
+++ b/doc/manual/cookbooks/benchmarks/davies_et_al/case-2.3.prm.out
@@ -0,0 +1,14 @@
+set %%\hyperref[parameters:Additional shared libraries]{Additional shared libraries}% = ./case-2.3-plugin/libVoT.so%% \index[prmindex]{Additional shared libraries} \index[prmindexfull]{Additional shared libraries} %
+
+subsection %%\hyperref[parameters:Material_20model]{Material model}%
+ set %%\hyperref[parameters:Material model/Model name]{Model name}% = VoT%% \index[prmindex]{Model name} \index[prmindexfull]{Material model!Model name} %
+
+ subsection %%\hyperref[parameters:Material_20model/VoT_20model]{VoT model}%
+ set %%\hyperref[parameters:Material model/VoT model/Reference density]{Reference density}% = 1%% \index[prmindex]{Reference density} \index[prmindexfull]{Material model!VoT model!Reference density} %
+ set %%\hyperref[parameters:Material model/VoT model/Reference specific heat]{Reference specific heat}% = 1.%% \index[prmindex]{Reference specific heat} \index[prmindexfull]{Material model!VoT model!Reference specific heat} %
+ set %%\hyperref[parameters:Material model/VoT model/Reference temperature]{Reference temperature}% = 0%% \index[prmindex]{Reference temperature} \index[prmindexfull]{Material model!VoT model!Reference temperature} %
+ set %%\hyperref[parameters:Material model/VoT model/Thermal conductivity]{Thermal conductivity}% = 1%% \index[prmindex]{Thermal conductivity} \index[prmindexfull]{Material model!VoT model!Thermal conductivity} %
+ set %%\hyperref[parameters:Material model/VoT model/Thermal expansion coefficient]{Thermal expansion coefficient}% = 1e-5%% \index[prmindex]{Thermal expansion coefficient} \index[prmindexfull]{Material model!VoT model!Thermal expansion coefficient} %
+ set %%\hyperref[parameters:Material model/VoT model/Viscosity]{Viscosity}% = 1%% \index[prmindex]{Viscosity} \index[prmindexfull]{Material model!VoT model!Viscosity} %
+ end
+end
More information about the CIG-COMMITS
mailing list