[cig-commits] [commit] master: add test (0b392a5)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Jun 4 12:47:51 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/dea94ae3fdac1f434e32718c384fe5ce83109802...db7eea299d721e7afa2dc72d8f42352dc88a9e16
>---------------------------------------------------------------
commit 0b392a51598a92973a1079211c15ed841abac410
Author: Timo Heister <timo.heister at gmail.com>
Date: Mon Jun 2 18:07:44 2014 -0400
add test
>---------------------------------------------------------------
0b392a51598a92973a1079211c15ed841abac410
...first-time-step.prm => graphical_output_02.prm} | 22 +++-
.../screen-output | 41 +++----
.../solution-00000.0000.gnuplot | 119 +++++++++++++++++++++
tests/graphical_output_02/statistics | 25 +++++
4 files changed, 188 insertions(+), 19 deletions(-)
diff --git a/tests/box-first-time-step.prm b/tests/graphical_output_02.prm
similarity index 80%
copy from tests/box-first-time-step.prm
copy to tests/graphical_output_02.prm
index f09526e..8676ece 100644
--- a/tests/box-first-time-step.prm
+++ b/tests/graphical_output_02.prm
@@ -29,6 +29,19 @@ subsection Geometry model
end
end
+subsection Compositional fields
+ set Number of fields = 2
+end
+
+subsection Compositional initial conditions
+ set Model name = function
+
+ subsection Function
+ set Variable names = x,y
+ set Function expression = if(y<0.2, 1, 0) ; 1
+ end
+end
+
subsection Initial conditions
set Model name = perturbed box
@@ -51,7 +64,7 @@ end
subsection Mesh refinement
set Initial adaptive refinement = 0
- set Initial global refinement = 5
+ set Initial global refinement = 2
end
@@ -64,5 +77,12 @@ end
subsection Postprocess
set List of postprocessors = visualization, velocity statistics, basic statistics, temperature statistics, heat flux statistics
+
+ subsection Visualization
+ set Output format = gnuplot
+
+ end
+
+
end
diff --git a/tests/box-first-time-step/screen-output b/tests/graphical_output_02/screen-output
similarity index 50%
copy from tests/box-first-time-step/screen-output
copy to tests/graphical_output_02/screen-output
index b638a63..b14020b 100644
--- a/tests/box-first-time-step/screen-output
+++ b/tests/graphical_output_02/screen-output
@@ -1,18 +1,20 @@
-----------------------------------------------------------------------------
-- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.
--- . version 1.1.pre
+-- . version 1.2.pre
-- . running in DEBUG mode
-- . running with 1 MPI process
-- . using Trilinos
-----------------------------------------------------------------------------
-Number of active cells: 1,024 (on 6 levels)
-Number of degrees of freedom: 13,764 (8,450+1,089+4,225)
+Number of active cells: 16 (on 3 levels)
+Number of degrees of freedom: 430 (162+25+81+81+81)
*** Timestep 0: t=0 seconds
Solving temperature system... 0 iterations.
+ Solving composition system 1... 0 iterations.
+ Solving composition system 2... 0 iterations.
Rebuilding Stokes preconditioner...
- Solving Stokes system... 30+8 iterations.
+ Solving Stokes system... 25 iterations.
Postprocessing:
@@ -28,27 +30,30 @@ Number of degrees of freedom: 13,764 (8,450+1,089+4,225)
reference_cp: 1250
reference_thermal_diffusivity: 8e-10
- Writing graphical output: output-box-first-time-step/solution-00000
- RMS, max velocity: 9e-09 m/s, 3.23e-08 m/s
- Temperature min/avg/max: 0 K, 1.035 K, 1.1 K
- Heat fluxes through boundary parts: 1.668e-07 W, 8.017e-05 W, 2.402e-07 W, 2.402e-07 W
+ Writing graphical output: output-graphical_output_02/solution-00000
+ RMS, max velocity: 3.43e-08 m/s, 1.21e-07 m/s
+ Temperature min/avg/max: 0 K, 0.9989 K, 1.1 K
+ Heat fluxes through boundary parts: 1.748e-07 W, 1.017e-05 W, 2.517e-07 W, 2.517e-07 W
Termination requested by criterion: end time
+---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start | 1.68s | |
+| Total wallclock time elapsed since start | 0.0809s | |
| | | |
| Section | no. calls | wall time | % of total |
+---------------------------------+-----------+------------+------------+
-| Assemble Stokes system | 1 | 0.264s | 16% |
-| Assemble temperature system | 1 | 0.242s | 14% |
-| Build Stokes preconditioner | 1 | 0.278s | 17% |
-| Build temperature preconditioner| 1 | 0.0141s | 0.84% |
-| Solve Stokes system | 1 | 0.293s | 17% |
-| Solve temperature system | 1 | 0.00148s | 0.088% |
-| Initialization | 2 | 0.0897s | 5.3% |
-| Postprocessing | 1 | 0.171s | 10% |
-| Setup dof systems | 1 | 0.201s | 12% |
+| Assemble Stokes system | 1 | 0.0062s | 7.7% |
+| Assemble composition system | 2 | 0.0138s | 17% |
+| Assemble temperature system | 1 | 0.00729s | 9% |
+| Build Stokes preconditioner | 1 | 0.00958s | 12% |
+| Build composition preconditioner| 2 | 0.000584s | 0.72% |
+| Build temperature preconditioner| 1 | 0.000573s | 0.71% |
+| Solve Stokes system | 1 | 0.00447s | 5.5% |
+| Solve composition system | 2 | 0.00041s | 0.51% |
+| Solve temperature system | 1 | 0.000302s | 0.37% |
+| Initialization | 2 | 0.0232s | 29% |
+| Postprocessing | 1 | 0.00339s | 4.2% |
+| Setup dof systems | 1 | 0.00693s | 8.6% |
+---------------------------------+-----------+------------+------------+
diff --git a/tests/graphical_output_02/solution-00000.0000.gnuplot b/tests/graphical_output_02/solution-00000.0000.gnuplot
new file mode 100644
index 0000000..466cc13
--- /dev/null
+++ b/tests/graphical_output_02/solution-00000.0000.gnuplot
@@ -0,0 +1,119 @@
+# This file was generated by the deal.II library.
+
+
+#
+# For a description of the GNUPLOT format see the GNUPLOT manual.
+#
+# <x> <y> <velocity> <velocity> <p> <T> <C_1> <C_2>
+0 0 0 0 1 1 1 1
+0.3 0 0 0 0.999999 1 1 1
+
+0 0.25 0 0 0.75 1 0 1
+0.3 0.25 -1.80889e-10 3.99857e-09 0.75 1.05 0 1
+
+
+0.3 0 0 0 0.999999 1 1 1
+0.6 0 0 0 0.999999 1 1 1
+
+0.3 0.25 -1.80889e-10 3.99857e-09 0.75 1.05 0 1
+0.6 0.25 -1.902e-08 1.81977e-08 0.75 1.07071 0 1
+
+
+0 0.25 0 0 0.75 1 0 1
+0.3 0.25 -1.80889e-10 3.99857e-09 0.75 1.05 0 1
+
+0 0.5 0 0 0.5 1 0 1
+0.3 0.5 -3.16892e-17 7.6095e-09 0.5 1.07071 0 1
+
+
+0.3 0.25 -1.80889e-10 3.99857e-09 0.75 1.05 0 1
+0.6 0.25 -1.902e-08 1.81977e-08 0.75 1.07071 0 1
+
+0.3 0.5 -3.16892e-17 7.6095e-09 0.5 1.07071 0 1
+0.6 0.5 3.29152e-18 3.19597e-08 0.5 1.1 0 1
+
+
+0.6 0 0 0 0.999999 1 1 1
+0.9 0 0 0 1 1 1 1
+
+0.6 0.25 -1.902e-08 1.81977e-08 0.75 1.07071 0 1
+0.9 0.25 -4.61309e-08 1.97073e-08 0.75 1.05 0 1
+
+
+0.9 0 0 0 1 1 1 1
+1.2 0 0 0 1 0 1 1
+
+0.9 0.25 -4.61309e-08 1.97073e-08 0.75 1.05 0 1
+1.2 0.25 0 -9.95791e-08 0.75 0 0 1
+
+
+0.6 0.25 -1.902e-08 1.81977e-08 0.75 1.07071 0 1
+0.9 0.25 -4.61309e-08 1.97073e-08 0.75 1.05 0 1
+
+0.6 0.5 3.29152e-18 3.19597e-08 0.5 1.1 0 1
+0.9 0.5 3.86488e-17 2.45837e-08 0.5 1.07071 0 1
+
+
+0.9 0.25 -4.61309e-08 1.97073e-08 0.75 1.05 0 1
+1.2 0.25 0 -9.95791e-08 0.75 0 0 1
+
+0.9 0.5 3.86488e-17 2.45837e-08 0.5 1.07071 0 1
+1.2 0.5 0 -1.4329e-07 0.5 0 0 1
+
+
+0 0.5 0 0 0.5 1 0 1
+0.3 0.5 -3.16892e-17 7.6095e-09 0.5 1.07071 0 1
+
+0 0.75 0 0 0.25 1 0 1
+0.3 0.75 1.80889e-10 3.99857e-09 0.25 1.05 0 1
+
+
+0.3 0.5 -3.16892e-17 7.6095e-09 0.5 1.07071 0 1
+0.6 0.5 3.29152e-18 3.19597e-08 0.5 1.1 0 1
+
+0.3 0.75 1.80889e-10 3.99857e-09 0.25 1.05 0 1
+0.6 0.75 1.902e-08 1.81977e-08 0.25 1.07071 0 1
+
+
+0 0.75 0 0 0.25 1 0 1
+0.3 0.75 1.80889e-10 3.99857e-09 0.25 1.05 0 1
+
+0 1 0 0 3.2821e-07 1 0 1
+0.3 1 0 0 4.75908e-07 1 0 1
+
+
+0.3 0.75 1.80889e-10 3.99857e-09 0.25 1.05 0 1
+0.6 0.75 1.902e-08 1.81977e-08 0.25 1.07071 0 1
+
+0.3 1 0 0 4.75908e-07 1 0 1
+0.6 1 0 0 5.6429e-07 1 0 1
+
+
+0.6 0.5 3.29152e-18 3.19597e-08 0.5 1.1 0 1
+0.9 0.5 3.86488e-17 2.45837e-08 0.5 1.07071 0 1
+
+0.6 0.75 1.902e-08 1.81977e-08 0.25 1.07071 0 1
+0.9 0.75 4.61309e-08 1.97073e-08 0.25 1.05 0 1
+
+
+0.9 0.5 3.86488e-17 2.45837e-08 0.5 1.07071 0 1
+1.2 0.5 0 -1.4329e-07 0.5 0 0 1
+
+0.9 0.75 4.61309e-08 1.97073e-08 0.25 1.05 0 1
+1.2 0.75 0 -9.95791e-08 0.249999 0 0 1
+
+
+0.6 0.75 1.902e-08 1.81977e-08 0.25 1.07071 0 1
+0.9 0.75 4.61309e-08 1.97073e-08 0.25 1.05 0 1
+
+0.6 1 0 0 5.6429e-07 1 0 1
+0.9 1 0 0 2.17762e-07 1 0 1
+
+
+0.9 0.75 4.61309e-08 1.97073e-08 0.25 1.05 0 1
+1.2 0.75 0 -9.95791e-08 0.249999 0 0 1
+
+0.9 1 0 0 2.17762e-07 1 0 1
+1.2 1 0 0 -2.84413e-06 0 0 1
+
+
diff --git a/tests/graphical_output_02/statistics b/tests/graphical_output_02/statistics
new file mode 100644
index 0000000..785f1e8
--- /dev/null
+++ b/tests/graphical_output_02/statistics
@@ -0,0 +1,25 @@
+# 1: Time step number
+# 2: Time (seconds)
+# 3: Number of mesh cells
+# 4: Number of Stokes degrees of freedom
+# 5: Number of temperature degrees of freedom
+# 6: Number of degrees of freedom for all compositions
+# 7: Iterations for temperature solver
+# 8: Iterations for composition solver 1
+# 9: Iterations for composition solver 2
+# 10: Iterations for Stokes solver
+# 11: Velocity iterations in Stokes preconditioner
+# 12: Schur complement iterations in Stokes preconditioner
+# 13: Time step size (seconds)
+# 14: Visualization file name
+# 15: RMS velocity (m/s)
+# 16: Max. velocity (m/s)
+# 17: Minimal temperature (K)
+# 18: Average temperature (K)
+# 19: Maximal temperature (K)
+# 20: Average nondimensional temperature (K)
+# 21: Outward heat flux through boundary with indicator 0 (W)
+# 22: Outward heat flux through boundary with indicator 1 (W)
+# 23: Outward heat flux through boundary with indicator 2 (W)
+# 24: Outward heat flux through boundary with indicator 3 (W)
+0 0.0000e+00 16 187 81 162 0 0 0 25 26 25 8.7236e+05 output-graphical_output_02/solution-00000 3.43214370e-08 1.20899166e-07 0.00000000e+00 9.98872717e-01 1.10000000e+00 9.98872717e-01 1.74802589e-07 1.01748026e-05 2.51715729e-07 2.51715729e-07
More information about the CIG-COMMITS
mailing list