[cig-commits] [commit] master: Restore messed up test output (f7aed5a)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon May 19 15:14:09 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/ed4caebc0ab942d8c7bc1a6a3ba70e37f93accde...dbe66e1b6d25d5ff21653c48f14f343e10ae69f4
>---------------------------------------------------------------
commit f7aed5a296e675c75831ceec63f0bf6d1d66e66a
Author: ian-r-rose <ian.r.rose at gmail.com>
Date: Mon May 19 16:53:07 2014 -0500
Restore messed up test output
>---------------------------------------------------------------
f7aed5a296e675c75831ceec63f0bf6d1d66e66a
tests/multicomponent_arithmetic/screen-output | 44 ++++++++++-----------
tests/multicomponent_arithmetic/statistics | 8 ++--
tests/multicomponent_geometric/screen-output | 38 +++++++++---------
tests/multicomponent_geometric/statistics | 8 ++--
tests/multicomponent_harmonic/screen-output | 32 +++++++--------
tests/multicomponent_max_composition/screen-output | 46 +++++++++++-----------
tests/multicomponent_max_composition/statistics | 8 ++--
7 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/tests/multicomponent_arithmetic/screen-output b/tests/multicomponent_arithmetic/screen-output
index 1dc45ae..e60ddbe 100644
--- a/tests/multicomponent_arithmetic/screen-output
+++ b/tests/multicomponent_arithmetic/screen-output
@@ -1,6 +1,6 @@
-----------------------------------------------------------------------------
-- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.
--- . running in DEBUG mode
+-- . running in OPTIMIZED mode
-- . running with 1 MPI process
-- . using Trilinos
-----------------------------------------------------------------------------
@@ -25,28 +25,28 @@ Number of degrees of freedom: 32,247 (10,306+1,329+5,153+5,153+5,153+5,153)
Solving composition system 2... 0 iterations.
Solving composition system 3... 0 iterations.
Rebuilding Stokes preconditioner...
- Solving Stokes system... 30+6 iterations.
+ Solving Stokes system... 30+5 iterations.
Postprocessing:
Writing graphical output: output-multicomponent_arithmetic/solution-00000
-*** Timestep 1: t=59823.9 years
+*** Timestep 1: t=56884.3 years
Solving temperature system... 10 iterations.
Solving composition system 1... 11 iterations.
- Solving composition system 2... 15 iterations.
+ Solving composition system 2... 14 iterations.
Solving composition system 3... 11 iterations.
Rebuilding Stokes preconditioner...
- Solving Stokes system... 30+2 iterations.
+ Solving Stokes system... 30+1 iterations.
Postprocessing:
-*** Timestep 2: t=124411 years
+*** Timestep 2: t=112724 years
Solving temperature system... 10 iterations.
Solving composition system 1... 11 iterations.
Solving composition system 2... 11 iterations.
Solving composition system 3... 10 iterations.
Rebuilding Stokes preconditioner...
- Solving Stokes system... 30+3 iterations.
+ Solving Stokes system... 30+1 iterations.
Postprocessing:
@@ -54,23 +54,23 @@ Termination requested by criterion: end step
+---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start | 11.6s | |
+| Total wallclock time elapsed since start | 4.55s | |
| | | |
| Section | no. calls | wall time | % of total |
+---------------------------------+-----------+------------+------------+
-| Assemble Stokes system | 4 | 2.79s | 24% |
-| Assemble composition system | 12 | 1.78s | 15% |
-| Assemble temperature system | 4 | 0.731s | 6.3% |
-| Build Stokes preconditioner | 4 | 2.74s | 24% |
-| Build composition preconditioner| 12 | 0.102s | 0.88% |
-| Build temperature preconditioner| 4 | 0.0329s | 0.28% |
-| Solve Stokes system | 4 | 1.39s | 12% |
-| Solve composition system | 12 | 0.055s | 0.48% |
-| Solve temperature system | 4 | 0.0158s | 0.14% |
-| Initialization | 3 | 0.139s | 1.2% |
-| Postprocessing | 3 | 0.11s | 0.95% |
-| Refine mesh structure, part 1 | 1 | 0.714s | 6.2% |
-| Refine mesh structure, part 2 | 1 | 0.00474s | 0.041% |
-| Setup dof systems | 2 | 0.802s | 6.9% |
+| Assemble Stokes system | 4 | 0.85s | 19% |
+| Assemble composition system | 12 | 0.72s | 16% |
+| Assemble temperature system | 4 | 0.342s | 7.5% |
+| Build Stokes preconditioner | 4 | 0.477s | 10% |
+| Build composition preconditioner| 12 | 0.102s | 2.2% |
+| Build temperature preconditioner| 4 | 0.033s | 0.72% |
+| Solve Stokes system | 4 | 1.31s | 29% |
+| Solve composition system | 12 | 0.0378s | 0.83% |
+| Solve temperature system | 4 | 0.0116s | 0.26% |
+| Initialization | 3 | 0.0651s | 1.4% |
+| Postprocessing | 3 | 0.0518s | 1.1% |
+| Refine mesh structure, part 1 | 1 | 0.183s | 4% |
+| Refine mesh structure, part 2 | 1 | 0.00291s | 0.064% |
+| Setup dof systems | 2 | 0.336s | 7.4% |
+---------------------------------+-----------+------------+------------+
diff --git a/tests/multicomponent_arithmetic/statistics b/tests/multicomponent_arithmetic/statistics
index 0f0474b..2d26931 100644
--- a/tests/multicomponent_arithmetic/statistics
+++ b/tests/multicomponent_arithmetic/statistics
@@ -11,7 +11,7 @@
# 11: Iterations for Stokes solver
# 12: Time step size (years)
# 13: Visualization file name
-0 0.0000e+00 4096 37667 16705 16705 0 0 0 0 36 1.1944e+05 ""
-0 0.0000e+00 1204 11635 5153 5153 0 0 0 0 36 5.9824e+04 output-multicomponent_arithmetic/solution-00000
-1 5.9824e+04 1204 11635 5153 5153 10 11 15 11 32 6.4588e+04 ""
-2 1.2441e+05 1204 11635 5153 5153 10 11 11 10 33 6.6786e+04 ""
+0 0.0000e+00 4096 37667 16705 16705 0 0 0 0 36 1.1342e+05 ""
+0 0.0000e+00 1204 11635 5153 5153 0 0 0 0 35 5.6884e+04 output-multicomponent_arithmetic/solution-00000
+1 5.6884e+04 1204 11635 5153 5153 10 11 14 11 31 5.5840e+04 ""
+2 1.1272e+05 1204 11635 5153 5153 10 11 11 10 31 5.5534e+04 ""
diff --git a/tests/multicomponent_geometric/screen-output b/tests/multicomponent_geometric/screen-output
index 9acfd96..6afc3e4 100644
--- a/tests/multicomponent_geometric/screen-output
+++ b/tests/multicomponent_geometric/screen-output
@@ -1,6 +1,6 @@
-----------------------------------------------------------------------------
-- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.
--- . running in DEBUG mode
+-- . running in OPTIMIZED mode
-- . running with 1 MPI process
-- . using Trilinos
-----------------------------------------------------------------------------
@@ -30,17 +30,17 @@ Number of degrees of freedom: 32,247 (10,306+1,329+5,153+5,153+5,153+5,153)
Postprocessing:
Writing graphical output: output-multicomponent_geometric/solution-00000
-*** Timestep 1: t=58641.8 years
+*** Timestep 1: t=56884.3 years
Solving temperature system... 10 iterations.
Solving composition system 1... 11 iterations.
- Solving composition system 2... 15 iterations.
+ Solving composition system 2... 14 iterations.
Solving composition system 3... 11 iterations.
Rebuilding Stokes preconditioner...
Solving Stokes system... 30+1 iterations.
Postprocessing:
-*** Timestep 2: t=117664 years
+*** Timestep 2: t=112724 years
Solving temperature system... 10 iterations.
Solving composition system 1... 11 iterations.
Solving composition system 2... 11 iterations.
@@ -54,23 +54,23 @@ Termination requested by criterion: end step
+---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start | 11.4s | |
+| Total wallclock time elapsed since start | 4.77s | |
| | | |
| Section | no. calls | wall time | % of total |
+---------------------------------+-----------+------------+------------+
-| Assemble Stokes system | 4 | 2.79s | 24% |
-| Assemble composition system | 12 | 1.78s | 16% |
-| Assemble temperature system | 4 | 0.743s | 6.5% |
-| Build Stokes preconditioner | 4 | 2.74s | 24% |
-| Build composition preconditioner| 12 | 0.102s | 0.89% |
-| Build temperature preconditioner| 4 | 0.0335s | 0.29% |
-| Solve Stokes system | 4 | 1.25s | 11% |
-| Solve composition system | 12 | 0.0548s | 0.48% |
-| Solve temperature system | 4 | 0.0157s | 0.14% |
-| Initialization | 3 | 0.138s | 1.2% |
-| Postprocessing | 3 | 0.111s | 0.97% |
-| Refine mesh structure, part 1 | 1 | 0.71s | 6.2% |
-| Refine mesh structure, part 2 | 1 | 0.00476s | 0.042% |
-| Setup dof systems | 2 | 0.804s | 7% |
+| Assemble Stokes system | 4 | 0.873s | 18% |
+| Assemble composition system | 12 | 0.757s | 16% |
+| Assemble temperature system | 4 | 0.345s | 7.2% |
+| Build Stokes preconditioner | 4 | 0.489s | 10% |
+| Build composition preconditioner| 12 | 0.106s | 2.2% |
+| Build temperature preconditioner| 4 | 0.0341s | 0.71% |
+| Solve Stokes system | 4 | 1.43s | 30% |
+| Solve composition system | 12 | 0.0439s | 0.92% |
+| Solve temperature system | 4 | 0.0126s | 0.26% |
+| Initialization | 3 | 0.0658s | 1.4% |
+| Postprocessing | 3 | 0.0516s | 1.1% |
+| Refine mesh structure, part 1 | 1 | 0.187s | 3.9% |
+| Refine mesh structure, part 2 | 1 | 0.00292s | 0.061% |
+| Setup dof systems | 2 | 0.342s | 7.2% |
+---------------------------------+-----------+------------+------------+
diff --git a/tests/multicomponent_geometric/statistics b/tests/multicomponent_geometric/statistics
index 1d0e136..6e21966 100644
--- a/tests/multicomponent_geometric/statistics
+++ b/tests/multicomponent_geometric/statistics
@@ -11,7 +11,7 @@
# 11: Iterations for Stokes solver
# 12: Time step size (years)
# 13: Visualization file name
-0 0.0000e+00 4096 37667 16705 16705 0 0 0 0 36 1.1699e+05 ""
-0 0.0000e+00 1204 11635 5153 5153 0 0 0 0 35 5.8642e+04 output-multicomponent_geometric/solution-00000
-1 5.8642e+04 1204 11635 5153 5153 10 11 15 11 31 5.9022e+04 ""
-2 1.1766e+05 1204 11635 5153 5153 10 11 11 10 31 5.9836e+04 ""
+0 0.0000e+00 4096 37667 16705 16705 0 0 0 0 36 1.1342e+05 ""
+0 0.0000e+00 1204 11635 5153 5153 0 0 0 0 35 5.6884e+04 output-multicomponent_geometric/solution-00000
+1 5.6884e+04 1204 11635 5153 5153 10 11 14 11 31 5.5840e+04 ""
+2 1.1272e+05 1204 11635 5153 5153 10 11 11 10 31 5.5534e+04 ""
diff --git a/tests/multicomponent_harmonic/screen-output b/tests/multicomponent_harmonic/screen-output
index da27f87..39e0e81 100644
--- a/tests/multicomponent_harmonic/screen-output
+++ b/tests/multicomponent_harmonic/screen-output
@@ -1,6 +1,6 @@
-----------------------------------------------------------------------------
-- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.
--- . running in DEBUG mode
+-- . running in OPTIMIZED mode
-- . running with 1 MPI process
-- . using Trilinos
-----------------------------------------------------------------------------
@@ -54,23 +54,23 @@ Termination requested by criterion: end step
+---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start | 11.5s | |
+| Total wallclock time elapsed since start | 4.56s | |
| | | |
| Section | no. calls | wall time | % of total |
+---------------------------------+-----------+------------+------------+
-| Assemble Stokes system | 4 | 2.76s | 24% |
-| Assemble composition system | 12 | 1.77s | 15% |
-| Assemble temperature system | 4 | 0.732s | 6.3% |
-| Build Stokes preconditioner | 4 | 2.74s | 24% |
-| Build composition preconditioner| 12 | 0.103s | 0.89% |
-| Build temperature preconditioner| 4 | 0.0329s | 0.29% |
-| Solve Stokes system | 4 | 1.41s | 12% |
-| Solve composition system | 12 | 0.054s | 0.47% |
-| Solve temperature system | 4 | 0.0159s | 0.14% |
-| Initialization | 3 | 0.141s | 1.2% |
-| Postprocessing | 3 | 0.111s | 0.96% |
-| Refine mesh structure, part 1 | 1 | 0.705s | 6.1% |
-| Refine mesh structure, part 2 | 1 | 0.00477s | 0.041% |
-| Setup dof systems | 2 | 0.807s | 7% |
+| Assemble Stokes system | 4 | 0.855s | 19% |
+| Assemble composition system | 12 | 0.714s | 16% |
+| Assemble temperature system | 4 | 0.339s | 7.4% |
+| Build Stokes preconditioner | 4 | 0.477s | 10% |
+| Build composition preconditioner| 12 | 0.103s | 2.2% |
+| Build temperature preconditioner| 4 | 0.0334s | 0.73% |
+| Solve Stokes system | 4 | 1.32s | 29% |
+| Solve composition system | 12 | 0.0374s | 0.82% |
+| Solve temperature system | 4 | 0.0115s | 0.25% |
+| Initialization | 3 | 0.0668s | 1.5% |
+| Postprocessing | 3 | 0.051s | 1.1% |
+| Refine mesh structure, part 1 | 1 | 0.182s | 4% |
+| Refine mesh structure, part 2 | 1 | 0.00286s | 0.063% |
+| Setup dof systems | 2 | 0.339s | 7.4% |
+---------------------------------+-----------+------------+------------+
diff --git a/tests/multicomponent_max_composition/screen-output b/tests/multicomponent_max_composition/screen-output
index 5aabd47..b5ef6ed 100644
--- a/tests/multicomponent_max_composition/screen-output
+++ b/tests/multicomponent_max_composition/screen-output
@@ -1,6 +1,6 @@
-----------------------------------------------------------------------------
-- This is ASPECT, the Advanced Solver for Problems in Earth's ConvecTion.
--- . running in DEBUG mode
+-- . running in OPTIMIZED mode
-- . running with 1 MPI process
-- . using Trilinos
-----------------------------------------------------------------------------
@@ -14,7 +14,7 @@ Number of degrees of freedom: 104,487 (33,410+4,257+16,705+16,705+16,705+16,705)
Solving composition system 2... 0 iterations.
Solving composition system 3... 0 iterations.
Rebuilding Stokes preconditioner...
- Solving Stokes system... 30+8 iterations.
+ Solving Stokes system... 30+6 iterations.
Number of active cells: 1,204 (on 7 levels)
Number of degrees of freedom: 32,247 (10,306+1,329+5,153+5,153+5,153+5,153)
@@ -25,28 +25,28 @@ Number of degrees of freedom: 32,247 (10,306+1,329+5,153+5,153+5,153+5,153)
Solving composition system 2... 0 iterations.
Solving composition system 3... 0 iterations.
Rebuilding Stokes preconditioner...
- Solving Stokes system... 30+7 iterations.
+ Solving Stokes system... 30+5 iterations.
Postprocessing:
Writing graphical output: output-multicomponent_max_composition/solution-00000
-*** Timestep 1: t=58762.5 years
+*** Timestep 1: t=56884.3 years
Solving temperature system... 10 iterations.
Solving composition system 1... 11 iterations.
- Solving composition system 2... 15 iterations.
+ Solving composition system 2... 14 iterations.
Solving composition system 3... 11 iterations.
Rebuilding Stokes preconditioner...
- Solving Stokes system... 30+5 iterations.
+ Solving Stokes system... 30+1 iterations.
Postprocessing:
-*** Timestep 2: t=117428 years
+*** Timestep 2: t=112724 years
Solving temperature system... 10 iterations.
Solving composition system 1... 11 iterations.
Solving composition system 2... 11 iterations.
Solving composition system 3... 10 iterations.
Rebuilding Stokes preconditioner...
- Solving Stokes system... 30+4 iterations.
+ Solving Stokes system... 30+1 iterations.
Postprocessing:
@@ -54,23 +54,23 @@ Termination requested by criterion: end step
+---------------------------------------------+------------+------------+
-| Total wallclock time elapsed since start | 11.9s | |
+| Total wallclock time elapsed since start | 4.89s | |
| | | |
| Section | no. calls | wall time | % of total |
+---------------------------------+-----------+------------+------------+
-| Assemble Stokes system | 4 | 2.76s | 23% |
-| Assemble composition system | 12 | 1.76s | 15% |
-| Assemble temperature system | 4 | 0.73s | 6.1% |
-| Build Stokes preconditioner | 4 | 2.75s | 23% |
-| Build composition preconditioner| 12 | 0.102s | 0.86% |
-| Build temperature preconditioner| 4 | 0.0332s | 0.28% |
-| Solve Stokes system | 4 | 1.77s | 15% |
-| Solve composition system | 12 | 0.0547s | 0.46% |
-| Solve temperature system | 4 | 0.0161s | 0.14% |
-| Initialization | 3 | 0.141s | 1.2% |
-| Postprocessing | 3 | 0.11s | 0.93% |
-| Refine mesh structure, part 1 | 1 | 0.716s | 6% |
-| Refine mesh structure, part 2 | 1 | 0.00482s | 0.04% |
-| Setup dof systems | 2 | 0.806s | 6.8% |
+| Assemble Stokes system | 4 | 0.92s | 19% |
+| Assemble composition system | 12 | 0.748s | 15% |
+| Assemble temperature system | 4 | 0.352s | 7.2% |
+| Build Stokes preconditioner | 4 | 0.483s | 9.9% |
+| Build composition preconditioner| 12 | 0.105s | 2.1% |
+| Build temperature preconditioner| 4 | 0.0353s | 0.72% |
+| Solve Stokes system | 4 | 1.46s | 30% |
+| Solve composition system | 12 | 0.0398s | 0.81% |
+| Solve temperature system | 4 | 0.0143s | 0.29% |
+| Initialization | 3 | 0.0718s | 1.5% |
+| Postprocessing | 3 | 0.0515s | 1.1% |
+| Refine mesh structure, part 1 | 1 | 0.192s | 3.9% |
+| Refine mesh structure, part 2 | 1 | 0.00295s | 0.06% |
+| Setup dof systems | 2 | 0.379s | 7.8% |
+---------------------------------+-----------+------------+------------+
diff --git a/tests/multicomponent_max_composition/statistics b/tests/multicomponent_max_composition/statistics
index 1b38924..58dad95 100644
--- a/tests/multicomponent_max_composition/statistics
+++ b/tests/multicomponent_max_composition/statistics
@@ -11,7 +11,7 @@
# 11: Iterations for Stokes solver
# 12: Time step size (years)
# 13: Visualization file name
-0 0.0000e+00 4096 37667 16705 16705 0 0 0 0 38 1.1691e+05 ""
-0 0.0000e+00 1204 11635 5153 5153 0 0 0 0 37 5.8762e+04 output-multicomponent_max_composition/solution-00000
-1 5.8762e+04 1204 11635 5153 5153 10 11 15 11 35 5.8665e+04 ""
-2 1.1743e+05 1204 11635 5153 5153 10 11 11 10 34 5.8398e+04 ""
+0 0.0000e+00 4096 37667 16705 16705 0 0 0 0 36 1.1342e+05 ""
+0 0.0000e+00 1204 11635 5153 5153 0 0 0 0 35 5.6884e+04 output-multicomponent_max_composition/solution-00000
+1 5.6884e+04 1204 11635 5153 5153 10 11 14 11 31 5.5840e+04 ""
+2 1.1272e+05 1204 11635 5153 5153 10 11 11 10 31 5.5534e+04 ""
More information about the CIG-COMMITS
mailing list