From b2d407f96259719ed9d86729b1b1c550f74a3f1e Mon Sep 17 00:00:00 2001 From: David Wells Date: Sun, 9 Feb 2025 13:26:28 -0500 Subject: [PATCH] Use the zorder partitioner in the step-18 test. This partitioner is both bundled with deal.II - using it provides stable output since, otherwise, we will use either Zoltan or METIS (depending on what is installed). --- tests/examples/step-18.diff | 37 ++++++++++++------- .../step-18.mpirun=2.with_petsc=true.output | 14 +++---- .../step-18.mpirun=2.with_petsc=true.output2 | 15 -------- 3 files changed, 31 insertions(+), 35 deletions(-) delete mode 100644 tests/examples/step-18.mpirun=2.with_petsc=true.output2 diff --git a/tests/examples/step-18.diff b/tests/examples/step-18.diff index 527de11c56..0d6679ba38 100644 --- a/tests/examples/step-18.diff +++ b/tests/examples/step-18.diff @@ -1,32 +1,43 @@ 26a27 > #include "../example_test.h" -699c700 +693c694,698 +< : triangulation(MPI_COMM_WORLD) +--- +> : triangulation( +> MPI_COMM_WORLD, +> {}, +> false, +> parallel::shared::Triangulation::Settings::partition_zorder) +699c704 < , end_time(10.0) --- > , end_time(1.0) -1088,1089c1089,1091 +1088,1089c1093,1095 < pcout << " Solver converged in " << n_iterations << " iterations." < << std::endl; --- -> //pcout << " Solver converged in " << n_iterations << " iterations." -> // << std::endl; +> // pcout << " Solver converged in " << n_iterations << " iterations." +> // << std::endl; > (void)n_iterations; -1126,1129c1128,1132 +1126,1129c1132,1139 < cg.solve(system_matrix, < distributed_incremental_displacement, < system_rhs, < preconditioner); --- > check_solver_within_range(pcout, -> cg.solve(system_matrix, distributed_incremental_displacement, system_rhs, preconditioner), -> solver_control.last_step(), -> 114, -> 130); -1330c1333 +> cg.solve(system_matrix, +> distributed_incremental_displacement, +> system_rhs, +> preconditioner), +> solver_control.last_step(), +> 100, +> 175); +1330c1340 < output_results(); --- -> //output_results(); -1358c1361 +> // output_results(); +1358c1368 < output_results(); --- -> //output_results(); +> // output_results(); diff --git a/tests/examples/step-18.mpirun=2.with_petsc=true.output b/tests/examples/step-18.mpirun=2.with_petsc=true.output index 1bc8081057..34ceffa291 100644 --- a/tests/examples/step-18.mpirun=2.with_petsc=true.output +++ b/tests/examples/step-18.mpirun=2.with_petsc=true.output @@ -1,15 +1,15 @@ Timestep 1 at time 1 Cycle 0: - Number of active cells: 3712 (by partition: 1972+1740) - Number of degrees of freedom: 17226 (by partition: 9396+7830) + Number of active cells: 3712 (by partition: 1856+1856) + Number of degrees of freedom: 17226 (by partition: 8874+8352) Assembling system... norm of rhs is 1.88062e+10 -Solver stopped within 114 - 130 iterations +Solver stopped within 100 - 175 iterations Updating quadrature point data... Cycle 1: - Number of active cells: 12805 (by partition: 7042+5763) - Number of degrees of freedom: 51696 (by partition: 29646+22050) - Assembling system... norm of rhs is 1.88062e+10 -Solver stopped within 114 - 130 iterations + Number of active cells: 12805 (by partition: 6399+6406) + Number of degrees of freedom: 51720 (by partition: 25902+25818) + Assembling system... norm of rhs is 1.72532e+10 +Solver stopped within 100 - 175 iterations Updating quadrature point data... Moving mesh... diff --git a/tests/examples/step-18.mpirun=2.with_petsc=true.output2 b/tests/examples/step-18.mpirun=2.with_petsc=true.output2 deleted file mode 100644 index d479649a9d..0000000000 --- a/tests/examples/step-18.mpirun=2.with_petsc=true.output2 +++ /dev/null @@ -1,15 +0,0 @@ -Timestep 1 at time 1 - Cycle 0: - Number of active cells: 3712 (by partition: 1856+1856) - Number of degrees of freedom: 17226 (by partition: 8874+8352) - Assembling system... norm of rhs is 1.88062e+10 -Solver stopped after 113 iterations - Updating quadrature point data... - Cycle 1: - Number of active cells: 12805 (by partition: 6399+6406) - Number of degrees of freedom: 51720 (by partition: 25902+25818) - Assembling system... norm of rhs is 1.72532e+10 -Solver stopped after 151 iterations - Updating quadrature point data... - Moving mesh... - -- 2.39.5