From c04bf4a00551b9ec4c015328263cf14b17236cf6 Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Thu, 16 Nov 2023 11:53:43 -0500 Subject: [PATCH 1/3] Switch reference tester to deal.II 9.5 --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 36a0fbba2cb..184a2dc92f5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -107,12 +107,12 @@ jobs: include: - image: "geodynamics/aspect-tester:focal-dealii-9.4-v4" run-tests: "ON" - compare-tests: "ON" + compare-tests: "OFF" result-file: "changes-test-results-9.4.diff" container-options: '--name container' - image: "geodynamics/aspect-tester:focal-dealii-9.5-v2" run-tests: "ON" - compare-tests: "OFF" + compare-tests: "ON" result-file: "changes-test-results-9.5.diff" container-options: '--name container' - image: "geodynamics/aspect-tester:focal-dealii-master" From 22a1af23750527f95fa9f67b7e7da6ef4530f17d Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Thu, 16 Nov 2023 14:28:48 -0500 Subject: [PATCH 2/3] Update Jenkins CI --- contrib/ci/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ci/Dockerfile b/contrib/ci/Dockerfile index b8772b89ae5..a666bc7048e 100644 --- a/contrib/ci/Dockerfile +++ b/contrib/ci/Dockerfile @@ -1,3 +1,3 @@ -FROM geodynamics/aspect-tester:focal-dealii-9.4-v4 +FROM geodynamics/aspect-tester:focal-dealii-9.5-v2 LABEL maintainer From fde90f25bf77217dee33516d568878cc7d0e9a37 Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Thu, 16 Nov 2023 14:29:15 -0500 Subject: [PATCH 3/3] Update tests --- tests/Picard_compressible/screen-output | 24 +- .../depth_average.gnuplot | 80 +- tests/adiabatic_conditions/screen-output | 4 +- tests/adiabatic_conditions/statistics | 2 +- .../solution/solution-00001.0000.gnuplot | 1532 +- .../depth_average.gnuplot | 64 +- .../depth_average.gnuplot | 80 +- .../screen-output | 4 +- .../statistics | 2 +- .../depth_average.gnuplot | 32 +- .../depth_average.gnuplot | 8 +- .../depth_average.gnuplot | 40 +- .../depth_average.gnuplot | 80 +- .../depth_average.gnuplot | 16 +- .../statistics | 2 +- tests/advection_solver_fail/screen-output | 6 +- .../advection_solver_fail/solver_history.txt | 3063 +- .../statistics | 2 +- .../solution/solution-00000.0000.gnuplot | 128 +- .../solution/solution-00001.0000.gnuplot | 128 +- .../statistics | 4 +- .../statistics | 4 +- .../statistics | 2 +- .../solution/solution-00000.0000.gnuplot | 12200 ++-- .../solution/solution-00001.0000.gnuplot | 1536 +- .../solution/solution-00001.0001.gnuplot | 1540 +- .../solution/solution-00003.0000.gnuplot | 4886 +- .../solution/solution-00003.0001.gnuplot | 4842 +- .../solution/solution-00000.0000.gnuplot | 588 +- .../screen-output | 14 +- .../statistics | 6 +- .../screen-output | 14 +- .../statistics | 6 +- .../solution/solution-00000.0000.gnuplot | 452 +- .../solution/solution-00000.0000.gnuplot | 4 +- tests/cells_in_circumference/screen-output | 2 +- tests/checkpoint_06_spherical_shell/log.txt1 | 2 +- tests/checkpoint_06_spherical_shell/log.txt2 | 2 +- .../solution-00005.0000.gnuplot1 | 1522 +- .../solution-00005.0000.gnuplot2 | 1522 +- .../checkpoint_06_spherical_shell/statistics1 | 12 +- .../checkpoint_06_spherical_shell/statistics2 | 12 +- .../particles/particles-00000.0000.vtu | 10 +- .../particles/particles-00010.0000.vtu | 10 +- .../screen-output | 2 +- .../solution/solution-00000.0000.gnuplot | 24572 +++---- .../solution/solution-00001.0000.gnuplot | 24574 +++---- .../screen-output | 2 +- .../solution/solution-00000.0000.gnuplot | 24572 +++---- .../solution/solution-00001.0000.gnuplot | 24576 +++---- .../screen-output | 2 +- .../solution/solution-00000.0000.gnuplot | 24572 +++---- .../solution/solution-00001.0000.gnuplot | 24576 +++---- .../screen-output | 4 +- tests/continental_extension/screen-output | 10 +- tests/crameri_benchmark_1_gmg/statistics | 2 +- .../solution/solution-00000.0000.gnuplot | 124 +- .../solution/solution-00000.0000.gnuplot | 96 +- tests/dc_Picard_compressible/screen-output | 24 +- tests/density_boundary/statistics | 4 +- .../depth_average_rounding_bug/screen-output | 2 +- tests/dynamic_topography3/screen-output | 2 +- .../solution/solution-00000.0000.gnuplot | 4608 +- tests/entropy_initial_lookup_wb/screen-output | 24 +- tests/entropy_plasticity/screen-output | 108 +- tests/entropy_plasticity/statistics | 8 +- tests/free_surface_blob_gmg/screen-output | 12 +- tests/free_surface_blob_gmg/statistics | 20 +- .../screen-output | 30 +- .../statistics | 20 +- .../statistics | 2 +- .../solution/solution-00000.0000.gnuplot | 4896 +- tests/geoid/screen-output | 2 +- tests/geoid/statistics | 2 +- tests/geoid_freesurface/topography.00001 | 144 +- tests/geoid_visualization/log.txt | 4 +- .../solution/solution-00000.0000.gnuplot | 4608 +- tests/geoid_visualization/statistics | 2 +- .../screen-output | 82 +- tests/gmg_mesh_deform_adaptive_bug/statistics | 80 +- .../gmg_mesh_deform_ghost_entries/statistics | 2 +- .../solution/solution-00000.0000.gnuplot | 588 +- .../screen-output | 6 +- tests/hollow_sphere_gmg_q3/screen-output | 14 +- tests/inclusion_adaptive/screen-output | 2 +- .../solution/solution-00000.0000.gnuplot | 1152 +- tests/inner_core/screen-output | 8 +- tests/inner_core/statistics | 4 +- tests/logo/screen-output | 14 +- tests/logo/statistics | 4 +- tests/matrix_nonzeros_4/statistics | 22 +- tests/matrix_nonzeros_5/statistics | 22 +- tests/matrix_nonzeros_6/statistics | 22 +- tests/matrix_nonzeros_7/statistics | 22 +- .../screen-output | 2 +- .../statistics | 4 +- .../solution/solution-00000.0000.gnuplot | 32 +- .../screen-output | 2 +- .../solution/solution-00000.0000.gnuplot | 1042 +- .../solution/solution-00000.0000.gnuplot | 1204 +- .../solution/solution-00000.0000.gnuplot | 55296 ++++++++-------- .../solution/solution-00000.0000.gnuplot | 55296 ++++++++-------- .../solution/solution-00003.0000.gnuplot | 1918 +- .../solution/solution-00003.0001.gnuplot | 1918 +- tests/no_cheap_gmg/statistics | 2 +- .../screen-output | 16 +- .../statistics | 2 +- .../screen-output | 20 +- .../statistics | 2 +- .../screen-output | 22 +- .../statistics | 10 +- .../solution/solution-00000.0000.vtu | 14 +- .../solution/solution-00000.0001.vtu | 14 +- .../solution/solution-00000.0002.vtu | 14 +- .../solution/solution-00001.0000.vtu | 14 +- .../solution/solution-00001.0001.vtu | 14 +- .../solution/solution-00001.0002.vtu | 14 +- .../solution/solution-00000.0000.vtu | 42 +- .../solution/solution-00001.0000.vtu | 42 +- .../solution/solution-00000.0000.vtu | 28 +- .../solution/solution-00000.0001.vtu | 14 +- .../solution/solution-00001.0000.vtu | 28 +- .../solution/solution-00001.0001.vtu | 14 +- .../particles/particles-00000.0001.vtu | 16 +- .../particles/particles-00000.0002.vtu | 16 +- .../particles/particles-00001.0001.vtu | 16 +- .../particles/particles-00001.0002.vtu | 16 +- .../particles/particles-00000.0000.vtu | 18 +- .../particles/particles-00001.0000.vtu | 18 +- .../particles/particles-00000.0000.vtu | 16 +- .../particles/particles-00001.0000.vtu | 16 +- .../particles/particles-00000.0000.vtu | 16 +- .../particles/particles-00001.0000.vtu | 16 +- .../particles/particles-00000.0000.vtu | 16 +- .../particles/particles-00001.0000.vtu | 16 +- .../screen-output | 4 +- .../particles/particles-00000.0000.vtu | 16 +- .../particles/particles-00000.0001.vtu | 16 +- .../particles/particles-00001.0000.vtu | 16 +- .../particles/particles-00001.0001.vtu | 16 +- .../particles/particles-00000.0000.vtu | 14 +- .../particles/particles-00000.0000.vtu | 18 +- .../particles/particles-00000.0001.vtu | 18 +- .../particles/particles-00001.0000.vtu | 18 +- .../particles/particles-00001.0001.vtu | 18 +- .../particles/particles-00000.0000.vtu | 12 +- .../particles/particles-00000.0001.vtu | 12 +- .../particles/particles-00001.0000.vtu | 12 +- .../particles/particles-00001.0001.vtu | 12 +- .../particles/particles-00000.0000.vtu | 18 +- .../particles/particles-00000.0001.vtu | 18 +- .../particles/particles-00001.0000.vtu | 18 +- .../particles/particles-00001.0001.vtu | 18 +- tests/point_value_02_mpi/point_values.txt | 112 +- tests/point_value_02_mpi/screen-output | 10 +- tests/remove_angular_momentum/screen-output | 58 +- tests/remove_angular_momentum/statistics | 58 +- tests/remove_net_rotation/screen-output | 58 +- tests/remove_net_rotation/statistics | 58 +- .../remove_net_surface_rotation/screen-output | 58 +- tests/remove_net_surface_rotation/statistics | 58 +- .../screen-output | 2 +- .../statistics | 4 +- .../geoid_anomaly.00000 | 96 +- tests/skip_refinement/screen-output | 6 +- tests/sol_cx_4_equal_order/screen-output | 2 +- .../screen-output | 2 +- .../screen-output | 2 +- .../particles/particles-00000.0000.vtu | 12 +- .../screen-output | 2 +- .../statistics | 2 +- tests/spectral_comparison/screen-output | 2 +- tests/spectral_comparison/statistics | 2 +- tests/spherical_nsinker/statistics | 2 +- .../solution/solution-00000.0000.gnuplot | 84 +- .../statistics | 4 +- tests/steinberger_cookbook/statistics | 4 +- .../steinberger_phase_fractions/screen-output | 2 +- .../solution/solution-00001.0000.gnuplot | 92 +- tests/steinberger_phase_fractions/statistics | 2 +- .../screen-output | 2 +- .../solution/solution-00001.0000.gnuplot | 68 +- .../statistics | 2 +- .../depth_average.gnuplot | 96 +- .../steinberger_projected_density/statistics | 2 +- .../depth_average.gnuplot | 160 +- .../screen-output | 62 +- .../statistics | 4 +- .../depth_average.gnuplot | 8 +- .../screen-output | 4 +- .../solution/solution-00000.0000.gnuplot | 28 +- .../steinberger_seismic_velocities/statistics | 4 +- tests/steinberger_viscosity/statistics | 2 +- .../depth_average.gnuplot | 8 +- .../screen-output | 2 +- .../statistics | 4 +- tests/stokes_solver_fail/screen-output | 4 +- tests/stokes_solver_fail/solver_history.txt | 2394 +- tests/stokes_solver_fail_cheap/screen-output | 4 +- .../solver_history.txt | 352 +- tests/stokes_solver_fail_gmg/screen-output | 4 +- .../stokes_solver_fail_gmg/solver_history.txt | 2412 +- tests/time_dependent_annulus/screen-output | 4 +- tests/time_dependent_annulus/statistics | 2 +- .../screen-output | 10 +- .../solution/solution-00000.0000.gnuplot | 3456 +- .../solution_surface-00000.0000.gnuplot | 288 +- .../statistics | 2 +- .../screen-output | 158 +- .../statistics | 6 +- .../screen-output | 355 +- .../statistics | 12 +- tests/update_script/screen-output | 4 +- tests/update_script/statistics | 4 +- tests/update_script_2/screen-output | 4 +- tests/update_script_2/statistics | 4 +- .../particles/particles-00000.0000.vtu | 16 +- .../particles/particles-00001.0000.vtu | 16 +- .../screen-output | 2 +- .../solution/solution-00000.0000.gnuplot | 44960 ++++++------- .../solution/solution-00001.0000.gnuplot | 45000 ++++++------- .../statistics | 2 +- .../solution/solution-00010.0000.gnuplot | 212 +- .../solution/solution-00000.0000.gnuplot | 36864 +++++------ tests/zero_matrix.prm | 13 - tests/zero_matrix/screen-output | 45 +- 226 files changed, 226530 insertions(+), 227578 deletions(-) diff --git a/tests/Picard_compressible/screen-output b/tests/Picard_compressible/screen-output index c233c9af1d0..bc2fa52e6c7 100644 --- a/tests/Picard_compressible/screen-output +++ b/tests/Picard_compressible/screen-output @@ -6,32 +6,32 @@ Number of degrees of freedom: 53,952 (25,344+3,264+12,672+12,672) Solving temperature system... 0 iterations. Skipping plastic_strain composition solve because RHS is zero. Rebuilding Stokes preconditioner... - Solving Stokes system... 54+0 iterations. + Solving Stokes system... 65+0 iterations. Relative nonlinear residual (Stokes system) after nonlinear iteration 1: 1 Rebuilding Stokes preconditioner... - Solving Stokes system... 58+0 iterations. - Relative nonlinear residual (Stokes system) after nonlinear iteration 2: 0.00789213 + Solving Stokes system... 73+0 iterations. + Relative nonlinear residual (Stokes system) after nonlinear iteration 2: 0.00886673 Rebuilding Stokes preconditioner... - Solving Stokes system... 53+0 iterations. - Relative nonlinear residual (Stokes system) after nonlinear iteration 3: 0.00039627 + Solving Stokes system... 69+0 iterations. + Relative nonlinear residual (Stokes system) after nonlinear iteration 3: 0.000575252 Rebuilding Stokes preconditioner... - Solving Stokes system... 40+0 iterations. - Relative nonlinear residual (Stokes system) after nonlinear iteration 4: 5.98393e-05 + Solving Stokes system... 55+0 iterations. + Relative nonlinear residual (Stokes system) after nonlinear iteration 4: 7.89675e-05 Rebuilding Stokes preconditioner... - Solving Stokes system... 25+0 iterations. - Relative nonlinear residual (Stokes system) after nonlinear iteration 5: 6.8821e-06 + Solving Stokes system... 38+0 iterations. + Relative nonlinear residual (Stokes system) after nonlinear iteration 5: 8.53899e-06 Postprocessing: - RMS, max velocity: 0.000626 m/year, 0.00264 m/year - Temperature min/avg/max: 273 K, 2086 K, 3500 K + RMS, max velocity: 0.00238 m/year, 0.0173 m/year + Temperature min/avg/max: 273 K, 2037 K, 3500 K Compositions min/max/mass: 0/0/0 Writing depth average: output-Picard_compressible/depth_average - Heat fluxes through boundary parts: -1.302e+06 W, 1.616e+06 W + Heat fluxes through boundary parts: -1.397e+06 W, 1.855e+06 W Termination requested by criterion: end time diff --git a/tests/adiabatic_conditions/depth_average.gnuplot b/tests/adiabatic_conditions/depth_average.gnuplot index 2eb8092066d..ffbbcf7a9a6 100644 --- a/tests/adiabatic_conditions/depth_average.gnuplot +++ b/tests/adiabatic_conditions/depth_average.gnuplot @@ -5,73 +5,73 @@ # For a description of the GNUPLOT format see the GNUPLOT manual. # #