[cig-commits] [commit] master: fix test output (cff3ec5)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Aug 15 16:52:34 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/a3863d7f36991fe70444446b43568d7f7c3c3cd7...3adfd87dec1546e9cd43c7d0a85230cc6d56c458
>---------------------------------------------------------------
commit cff3ec50bcf3e8bd2a13a493dcd8fbb1ee9eb208
Author: Timo Heister <timo.heister at gmail.com>
Date: Thu Aug 14 09:37:17 2014 -0400
fix test output
>---------------------------------------------------------------
cff3ec50bcf3e8bd2a13a493dcd8fbb1ee9eb208
tests/boundary-temperature-function/statistics | 2 +-
tests/burstedde/screen-output | 2 +-
tests/diffusion/statistics | 8 ++++----
tests/maximum_refinement_function/statistics | 8 ++++----
tests/maximum_refinement_function_cartesian/statistics | 8 ++++----
tests/maximum_refinement_function_spherical/statistics | 10 +++++-----
tests/petsc_use_petsc/screen-output | 4 ++--
tests/pressure-compatibility/statistics | 8 ++++----
8 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/tests/boundary-temperature-function/statistics b/tests/boundary-temperature-function/statistics
index 2fc3138..8c7c062 100644
--- a/tests/boundary-temperature-function/statistics
+++ b/tests/boundary-temperature-function/statistics
@@ -15,4 +15,4 @@
# 15: Average nondimensional temperature (K)
# 16: RMS velocity (m/s)
# 17: Max. velocity (m/s)
-0 0.0000e+00 64 659 289 0 32 9 3 4.7714e+02 output-boundary-temperature-function/solution-00000 0.00000000e+00 7.92922653e+01 1.92000000e+03 2.10157077e-02 2.78573376e-05 1.19616223e-04
+0 0.0000e+00 64 659 289 0 32 9 3 4.7714e+02 output-boundary-temperature-function/solution-00000 0.00000000e+00 7.92922653e+01 1.92000000e+03 2.26549329e-02 2.78573376e-05 1.19616223e-04
diff --git a/tests/burstedde/screen-output b/tests/burstedde/screen-output
index 76585f2..a03c4a3 100644
--- a/tests/burstedde/screen-output
+++ b/tests/burstedde/screen-output
@@ -14,7 +14,7 @@ Number of degrees of freedom: 3,041 (2,187+125+729)
*** Timestep 0: t=0 seconds
Solving temperature system... 0 iterations.
Rebuilding Stokes preconditioner...
- Solving Stokes system... 0+57 iterations.
+ Solving Stokes system... 0+54 iterations.
Postprocessing:
RMS, max velocity: 4.3 m/s, 13.2 m/s
diff --git a/tests/diffusion/statistics b/tests/diffusion/statistics
index 739aec4..ca9fca4 100644
--- a/tests/diffusion/statistics
+++ b/tests/diffusion/statistics
@@ -17,7 +17,7 @@
# 17: Outward heat flux through boundary with indicator 2 ("bottom") (W)
# 18: Outward heat flux through boundary with indicator 3 ("top") (W)
0 0.0000e+00 1024 9539 4225 12 23 24 23 2.3885e+06 -6.78365411e-17 5.20833333e-03 1.00000000e+00 5.20833333e-03 -4.76183056e-20 -8.31429357e-20 -4.28773551e-45 -9.60000000e-05
-1 2.3885e+06 1024 9539 4225 48 28 29 29 7.6038e+06 0.00000000e+00 4.38185361e-02 1.00000000e+00 4.38185361e-02 2.71849581e-18 4.55846348e-18 5.09335078e-15 -2.13724705e-05
-2 9.9923e+06 1024 9539 4225 63 27 28 28 1.7581e+07 0.00000000e+00 1.03010788e-01 1.00000000e+00 1.03010788e-01 -8.00360611e-17 -1.14398856e-16 5.32895328e-12 -1.20162988e-06
-3 2.7573e+07 1024 9539 4225 93 29 30 30 1.2427e+07 0.00000000e+00 1.73433731e-01 1.00000000e+00 1.73433731e-01 -2.26048434e-16 1.32084255e-16 1.64579510e-09 -1.59518564e-06
-4 4.0000e+07 1024 9539 4225 78 29 30 30 2.8297e+08 0.00000000e+00 2.05582707e-01 1.00000000e+00 2.05582707e-01 9.35498193e-17 3.35741987e-17 6.82281435e-09 -2.49587784e-06
+1 2.3885e+06 1024 9539 4225 48 28 29 29 7.6038e+06 0.00000000e+00 4.38185361e-02 1.00000000e+00 4.38185361e-02 2.71935214e-18 4.55852343e-18 5.09335078e-15 -2.13724705e-05
+2 9.9923e+06 1024 9539 4225 63 27 28 28 1.7581e+07 0.00000000e+00 1.03010788e-01 1.00000000e+00 1.03010788e-01 -8.00375827e-17 -1.14397727e-16 5.32895329e-12 -1.20162988e-06
+3 2.7573e+07 1024 9539 4225 93 29 30 30 1.2427e+07 0.00000000e+00 1.73433732e-01 1.00000000e+00 1.73433732e-01 -2.26173173e-16 1.32083220e-16 1.64579518e-09 -1.59518561e-06
+4 4.0000e+07 1024 9539 4225 78 29 30 30 2.8300e+08 0.00000000e+00 2.05582707e-01 1.00000000e+00 2.05582707e-01 9.35667610e-17 3.36475184e-17 6.82281436e-09 -2.49587783e-06
diff --git a/tests/maximum_refinement_function/statistics b/tests/maximum_refinement_function/statistics
index 92ba681..c429568 100644
--- a/tests/maximum_refinement_function/statistics
+++ b/tests/maximum_refinement_function/statistics
@@ -15,10 +15,10 @@
# 15: Average temperature (K)
# 16: Maximal temperature (K)
# 17: Average nondimensional temperature (K)
-# 18: Outward heat flux through boundary with indicator 0 (W)
-# 19: Outward heat flux through boundary with indicator 1 (W)
-# 20: Outward heat flux through boundary with indicator 2 (W)
-# 21: Outward heat flux through boundary with indicator 3 (W)
+# 18: Outward heat flux through boundary with indicator 0 ("left") (W)
+# 19: Outward heat flux through boundary with indicator 1 ("right") (W)
+# 20: Outward heat flux through boundary with indicator 2 ("bottom") (W)
+# 21: Outward heat flux through boundary with indicator 3 ("top") (W)
0 0.0000e+00 64 659 289 0 18 19 54 5.2172e+09 output-maximum_refinement_function/solution-00000 3.79980811e-06 5.98257532e-06 1.62300000e+03 1.74279167e+03 1.87300000e+03 3.42261905e-02 2.37801676e-11 7.92672255e-12 2.14021509e-11 -4.60057899e-12
0 0.0000e+00 88 963 425 0 18 19 140 2.5926e+09 output-maximum_refinement_function/solution-00001 3.79833711e-06 6.02562908e-06 1.62300000e+03 1.74539583e+03 1.87300000e+03 3.49702381e-02 9.05911149e-12 6.79433361e-12 4.45028852e-11 1.12950818e-11
0 0.0000e+00 160 1765 781 0 18 19 140 1.2942e+09 output-maximum_refinement_function/solution-00002 3.79800948e-06 6.03646482e-06 1.62300000e+03 1.74634527e+03 1.90425000e+03 3.52415055e-02 9.05911149e-12 6.79433361e-12 1.68725951e-11 -3.68602556e-11
diff --git a/tests/maximum_refinement_function_cartesian/statistics b/tests/maximum_refinement_function_cartesian/statistics
index 4dbdeff..ba59ed9 100644
--- a/tests/maximum_refinement_function_cartesian/statistics
+++ b/tests/maximum_refinement_function_cartesian/statistics
@@ -15,10 +15,10 @@
# 15: Average temperature (K)
# 16: Maximal temperature (K)
# 17: Average nondimensional temperature (K)
-# 18: Outward heat flux through boundary with indicator 0 (W)
-# 19: Outward heat flux through boundary with indicator 1 (W)
-# 20: Outward heat flux through boundary with indicator 2 (W)
-# 21: Outward heat flux through boundary with indicator 3 (W)
+# 18: Outward heat flux through boundary with indicator 0 ("left") (W)
+# 19: Outward heat flux through boundary with indicator 1 ("right") (W)
+# 20: Outward heat flux through boundary with indicator 2 ("bottom") (W)
+# 21: Outward heat flux through boundary with indicator 3 ("top") (W)
0 0.0000e+00 64 659 289 0 18 19 54 5.2172e+09 output-maximum_refinement_function_cartesian/solution-00000 3.79980811e-06 5.98257532e-06 1.62300000e+03 1.74279167e+03 1.87300000e+03 3.42261905e-02 2.37801676e-11 7.92672255e-12 2.14021509e-11 -4.60057899e-12
0 0.0000e+00 88 963 425 0 18 19 140 2.5926e+09 output-maximum_refinement_function_cartesian/solution-00001 3.79833711e-06 6.02562908e-06 1.62300000e+03 1.74539583e+03 1.87300000e+03 3.49702381e-02 9.05911149e-12 6.79433361e-12 4.45028852e-11 1.12950818e-11
0 0.0000e+00 184 1981 877 0 18 19 140 1.2942e+09 output-maximum_refinement_function_cartesian/solution-00002 3.79792541e-06 6.03630598e-06 1.62300000e+03 1.74669792e+03 1.87300000e+03 3.53422619e-02 9.05911149e-12 6.79433361e-12 1.68725951e-11 -3.68602556e-11
diff --git a/tests/maximum_refinement_function_spherical/statistics b/tests/maximum_refinement_function_spherical/statistics
index 0d06802..bf8cba9 100644
--- a/tests/maximum_refinement_function_spherical/statistics
+++ b/tests/maximum_refinement_function_spherical/statistics
@@ -15,13 +15,13 @@
# 15: Average temperature (K)
# 16: Maximal temperature (K)
# 17: Average nondimensional temperature (K)
-# 18: Outward heat flux through boundary with indicator 0 (W)
-# 19: Outward heat flux through boundary with indicator 1 (W)
-# 20: Outward heat flux through boundary with indicator 2 (W)
-# 21: Outward heat flux through boundary with indicator 3 (W)
+# 18: Outward heat flux through boundary with indicator 0 ("inner") (W)
+# 19: Outward heat flux through boundary with indicator 1 ("outer") (W)
+# 20: Outward heat flux through boundary with indicator 2 ("left") (W)
+# 21: Outward heat flux through boundary with indicator 3 ("right") (W)
0 0.0000e+00 192 1891 833 0 23 24 159 7.1597e+09 output-maximum_refinement_function_spherical/solution-00000 8.27602402e-07 1.47129249e-06 1.40082707e+03 1.62702227e+03 1.79917293e+03 6.46271982e-02 9.97963023e+02 1.95708558e+03 2.48024075e+03 2.48024075e+03
0 0.0000e+00 402 4155 1837 0 42 78 104 4.6093e+09 output-maximum_refinement_function_spherical/solution-00001 8.27658537e-07 1.47155108e-06 1.40082707e+03 1.62702039e+03 1.79917293e+03 6.46266617e-02 9.97963023e+02 1.95644850e+03 2.46327721e+03 2.46327721e+03
0 0.0000e+00 882 8623 3817 0 33 31 31 2.9967e+09 output-maximum_refinement_function_spherical/solution-00002 8.27678944e-07 1.47110407e-06 1.40082707e+03 1.62701943e+03 1.79917293e+03 6.46263864e-02 9.88524639e+02 1.95578196e+03 2.45268180e+03 2.45268180e+03
-0 0.0000e+00 1533 15163 6721 0 50 146 168 2.2148e+09 output-maximum_refinement_function_spherical/solution-00003 8.26062576e-07 1.47289809e-06 1.40002169e+03 1.62701913e+03 1.79997831e+03 6.48564134e-02 9.88524639e+02 1.95903998e+03 2.45229799e+03 2.45229799e+03
+0 0.0000e+00 1533 15163 6721 0 50 146 168 2.2148e+09 output-maximum_refinement_function_spherical/solution-00003 8.26021078e-07 1.47291326e-06 1.40002169e+03 1.62701913e+03 1.79997831e+03 6.48564134e-02 9.88524639e+02 1.95903998e+03 2.45229799e+03 2.45229799e+03
0 0.0000e+00 2628 25961 11509 0 35 51 50 1.5479e+09 output-maximum_refinement_function_spherical/solution-00004 8.27673002e-07 1.47233531e-06 1.40002169e+03 1.62701903e+03 1.79997831e+03 6.48563841e-02 9.85782060e+02 1.96147487e+03 2.44911432e+03 2.44911432e+03
0 0.0000e+00 3831 37508 16641 0 34 38 40 1.2705e+09 output-maximum_refinement_function_spherical/solution-00005 8.27671912e-07 1.47204274e-06 1.40002169e+03 1.62701907e+03 1.79997831e+03 6.48563963e-02 9.87027936e+02 1.96086786e+03 2.44833578e+03 2.44833578e+03
diff --git a/tests/petsc_use_petsc/screen-output b/tests/petsc_use_petsc/screen-output
index a52364f..f4690d4 100644
--- a/tests/petsc_use_petsc/screen-output
+++ b/tests/petsc_use_petsc/screen-output
@@ -14,8 +14,8 @@ Number of degrees of freedom: 49 (18+4+9+9+9)
*** Timestep 0: t=0 years
Solving temperature system... 0 iterations.
- Solving peridotite system ... 0 iterations.
- Solving eclogite system ... 0 iterations.
+ Solving composition system 1... 0 iterations.
+ Solving composition system 2... 0 iterations.
Rebuilding Stokes preconditioner...
Solving Stokes system... 7 iterations.
diff --git a/tests/pressure-compatibility/statistics b/tests/pressure-compatibility/statistics
index fdee379..0f7b482 100644
--- a/tests/pressure-compatibility/statistics
+++ b/tests/pressure-compatibility/statistics
@@ -12,10 +12,10 @@
# 12: Average temperature (K)
# 13: Maximal temperature (K)
# 14: Average nondimensional temperature (K)
-# 15: Outward heat flux through boundary with indicator 0 (W)
-# 16: Outward heat flux through boundary with indicator 1 (W)
-# 17: Outward heat flux through boundary with indicator 2 (W)
-# 18: Outward heat flux through boundary with indicator 3 (W)
+# 15: Outward heat flux through boundary with indicator 0 ("left") (W)
+# 16: Outward heat flux through boundary with indicator 1 ("right") (W)
+# 17: Outward heat flux through boundary with indicator 2 ("bottom") (W)
+# 18: Outward heat flux through boundary with indicator 3 ("top") (W)
# 19: RMS velocity (m/s)
# 20: Max. velocity (m/s)
0 0.0000e+00 64 659 289 0 19 20 20 6.2500e-02 0.00000000e+00 5.00000000e-01 1.00000000e+00 5.00000000e-01 3.58008376e-21 8.41071040e-21 -2.00000000e-06 2.00000000e-06 3.52685352e-01 1.02187233e+00
More information about the CIG-COMMITS
mailing list