From c0a5220ed25b4ececc190aee4f314c7e6b66d658 Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Fri, 10 May 2019 19:19:15 -0700 Subject: [PATCH] Rebase and update tests --- tests/random_composition_perturbation.prm | 2 +- tests/random_composition_perturbation/statistics | 2 +- tests/random_temperature_perturbation.prm | 2 +- tests/random_temperature_perturbation/screen-output | 4 ++-- tests/random_temperature_perturbation/statistics | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/random_composition_perturbation.prm b/tests/random_composition_perturbation.prm index 6852e5721cd..40c627c759c 100644 --- a/tests/random_composition_perturbation.prm +++ b/tests/random_composition_perturbation.prm @@ -1,7 +1,7 @@ # Test to check the status of the random initial composition perturbation # plugin. -subsection Model settings +subsection Boundary velocity model set Tangential velocity boundary indicators = left, right, bottom, top end diff --git a/tests/random_composition_perturbation/statistics b/tests/random_composition_perturbation/statistics index ad7b7e757d9..9743ff8bf2b 100644 --- a/tests/random_composition_perturbation/statistics +++ b/tests/random_composition_perturbation/statistics @@ -17,4 +17,4 @@ # 17: Minimal value for composition C_2 # 18: Maximal value for composition C_2 # 19: Global mass for composition C_2 -0 0.000000000000e+00 0.000000000000e+00 64 659 289 578 0 0 0 2 3 2 3.00222459e-01 6.99744700e-01 5.06886136e-01 -1.99012748e-01 1.99867409e-01 -7.40357014e-03 +0 0.000000000000e+00 0.000000000000e+00 64 659 289 578 0 0 0 1 3 2 3.00222459e-01 6.99744700e-01 5.06886136e-01 -1.99012748e-01 1.99867409e-01 -7.40357014e-03 diff --git a/tests/random_temperature_perturbation.prm b/tests/random_temperature_perturbation.prm index 52afa7b456a..9e560a64693 100644 --- a/tests/random_temperature_perturbation.prm +++ b/tests/random_temperature_perturbation.prm @@ -1,7 +1,7 @@ # Test to check the status of the random initial temperature perturbation # plugin. -subsection Model settings +subsection Boundary velocity model set Tangential velocity boundary indicators = left, right, bottom, top end diff --git a/tests/random_temperature_perturbation/screen-output b/tests/random_temperature_perturbation/screen-output index 8c84b221dbc..944cd96a0d8 100644 --- a/tests/random_temperature_perturbation/screen-output +++ b/tests/random_temperature_perturbation/screen-output @@ -5,10 +5,10 @@ Number of degrees of freedom: 948 (578+81+289) *** Timestep 0: t=0 years Solving temperature system... 0 iterations. Rebuilding Stokes preconditioner... - Solving Stokes system... 17+0 iterations. + Solving Stokes system... 14+0 iterations. Postprocessing: - Temperature min/avg/max: 0.3006 K, 0.4981 K, 0.6998 K + Temperature min/avg/max: 0.302 K, 0.4957 K, 0.6998 K Termination requested by criterion: end time diff --git a/tests/random_temperature_perturbation/statistics b/tests/random_temperature_perturbation/statistics index 1acb9b4bc8e..b5bfb68e845 100644 --- a/tests/random_temperature_perturbation/statistics +++ b/tests/random_temperature_perturbation/statistics @@ -11,4 +11,4 @@ # 11: Minimal temperature (K) # 12: Average temperature (K) # 13: Maximal temperature (K) -0 0.000000000000e+00 0.000000000000e+00 64 659 289 0 17 18 17 3.00591720e-01 4.98143186e-01 6.99842861e-01 +0 0.000000000000e+00 0.000000000000e+00 64 659 289 0 13 15 14 3.02047032e-01 4.95676273e-01 6.99758663e-01