From c598c2574c4694de9f0daa24a920a9848ec5d0da Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Sun, 12 Jun 2022 21:14:00 +0200 Subject: [PATCH] Fix more PETSc complex tests --- tests/simplex/step-17.cc | 13 +++++++------ tests/simplex/step-18.cc | 15 ++++++++------- tests/simplex/step-40.cc | 9 ++------- .../step-40.mpirun=1.with_petsc=true.output | 4 ++-- ...pirun=4.with_petsc=true.with_metis=true.output | 4 ++-- 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/tests/simplex/step-17.cc b/tests/simplex/step-17.cc index ec73dbcf7c..0da2d021f5 100644 --- a/tests/simplex/step-17.cc +++ b/tests/simplex/step-17.cc @@ -311,12 +311,13 @@ namespace Step17 system_matrix.compress(VectorOperation::add); system_rhs.compress(VectorOperation::add); - std::map boundary_values; - VectorTools::interpolate_boundary_values(mapping, - dof_handler, - 0, - Functions::ZeroFunction(dim), - boundary_values); + std::map boundary_values; + VectorTools::interpolate_boundary_values( + mapping, + dof_handler, + 0, + Functions::ZeroFunction(dim), + boundary_values); MatrixTools::apply_boundary_values( boundary_values, system_matrix, solution, system_rhs, false); } diff --git a/tests/simplex/step-18.cc b/tests/simplex/step-18.cc index 37ba34f885..b8a099550b 100644 --- a/tests/simplex/step-18.cc +++ b/tests/simplex/step-18.cc @@ -639,13 +639,14 @@ namespace Step18 #endif - FEValuesExtractors::Scalar z_component(dim - 1); - std::map boundary_values; - VectorTools::interpolate_boundary_values(mapping, - dof_handler, - 0, - Functions::ZeroFunction(dim), - boundary_values); + FEValuesExtractors::Scalar z_component(dim - 1); + std::map boundary_values; + VectorTools::interpolate_boundary_values( + mapping, + dof_handler, + 0, + Functions::ZeroFunction(dim), + boundary_values); VectorTools::interpolate_boundary_values( mapping, dof_handler, diff --git a/tests/simplex/step-40.cc b/tests/simplex/step-40.cc index 8ded4a77a8..c08c073809 100644 --- a/tests/simplex/step-40.cc +++ b/tests/simplex/step-40.cc @@ -288,7 +288,7 @@ namespace Step40 system_rhs, preconditioner), solver_control.last_step(), - 5, + 1, 9); constraints.distribute(completely_distributed_solution); @@ -340,12 +340,7 @@ namespace Step40 void LaplaceProblem::run() { - deallog << "Running with " -#ifdef USE_PETSC_LA - << "PETSc" -#else - << "Trilinos" -#endif + deallog << "Running " << " on " << Utilities::MPI::n_mpi_processes(mpi_communicator) << " MPI rank(s)..." << std::endl; diff --git a/tests/simplex/step-40.mpirun=1.with_petsc=true.output b/tests/simplex/step-40.mpirun=1.with_petsc=true.output index 5693999f84..011082cbfd 100644 --- a/tests/simplex/step-40.mpirun=1.with_petsc=true.output +++ b/tests/simplex/step-40.mpirun=1.with_petsc=true.output @@ -1,6 +1,6 @@ -DEAL::Running with PETSc on 1 MPI rank(s)... +DEAL::Running on 1 MPI rank(s)... DEAL:: Number of active cells: 512 DEAL:: Number of degrees of freedom: 1089 -DEAL::Solver stopped within 5 - 9 iterations +DEAL::Solver stopped within 1 - 9 iterations DEAL::0.0124965 diff --git a/tests/simplex/step-40.mpirun=4.with_petsc=true.with_metis=true.output b/tests/simplex/step-40.mpirun=4.with_petsc=true.with_metis=true.output index bff795f87f..2fd1c694ed 100644 --- a/tests/simplex/step-40.mpirun=4.with_petsc=true.with_metis=true.output +++ b/tests/simplex/step-40.mpirun=4.with_petsc=true.with_metis=true.output @@ -1,6 +1,6 @@ -DEAL::Running with PETSc on 4 MPI rank(s)... +DEAL::Running on 4 MPI rank(s)... DEAL:: Number of active cells: 512 DEAL:: Number of degrees of freedom: 1089 -DEAL::Solver stopped within 5 - 9 iterations +DEAL::Solver stopped within 1 - 9 iterations DEAL::0.0124965 -- 2.39.5