From: Wolfgang Bangerth Date: Mon, 27 Jan 2025 20:39:13 +0000 (-0700) Subject: Explicitly re-enable output for some tests. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b16c209ad51ce086f551d70f1264b04f1e7b059;p=dealii.git Explicitly re-enable output for some tests. --- diff --git a/tests/lac/gmres_reorthogonalize_02.cc b/tests/lac/gmres_reorthogonalize_02.cc index b7624ce60d..50a1af9bb5 100644 --- a/tests/lac/gmres_reorthogonalize_02.cc +++ b/tests/lac/gmres_reorthogonalize_02.cc @@ -41,7 +41,10 @@ test() for (unsigned int i = 0; i < n; ++i) matrix.diag_element(i) = (i + 1); - SolverControl control(1000, 1e3 * std::numeric_limits::epsilon()); + SolverControl control(1000, + 1e3 * std::numeric_limits::epsilon(), + false, + true); typename SolverGMRES>::AdditionalData data; data.max_basis_size = 200; data.orthogonalization_strategy = diff --git a/tests/lac/iteration_number_control.cc b/tests/lac/iteration_number_control.cc index 04e2ea4c9f..04e3e5df0a 100644 --- a/tests/lac/iteration_number_control.cc +++ b/tests/lac/iteration_number_control.cc @@ -39,7 +39,7 @@ check() in = 1.; { - IterationNumberControl control(5); + IterationNumberControl control(5, 1e-12, false, true); SolverCG<> solver(control); solver.solve(A, out, in, PreconditionIdentity()); AssertThrow(control.last_step() == 1, ExcInternalError()); @@ -53,7 +53,7 @@ check() out = 0; { - IterationNumberControl control(5); + IterationNumberControl control(5, 1e-12, false, true); SolverCG<> solver(control); solver.solve(A, out, in, PreconditionIdentity()); AssertThrow(control.last_step() == 5, ExcInternalError()); diff --git a/tests/lac/linear_operator_08.cc b/tests/lac/linear_operator_08.cc index 30c6c1a7a3..a33de5f9be 100644 --- a/tests/lac/linear_operator_08.cc +++ b/tests/lac/linear_operator_08.cc @@ -59,7 +59,7 @@ test_preconditioner_block(const MatrixType &A, PRECONDITIONER preconditioner; preconditioner.initialize(A, data); - SolverControl solver_control(100, 1.0e-10); + SolverControl solver_control(100, 1.0e-10, false, true); SolverCG solver(solver_control); // Exact inverse @@ -98,7 +98,7 @@ test_preconditioner(const SparseMatrix &A, // Exact inverse { deallog.push("Exact inverse"); - SolverControl solver_control(100, 1.0e-10); + SolverControl solver_control(100, 1.0e-10, false, true); SolverCG> solver(solver_control); const auto lo_A_inv = inverse_operator(lo_A, solver, preconditioner); @@ -130,7 +130,7 @@ test_solver(const SparseMatrix &A, const Vector &b) // Standard solver { deallog.push("Standard solver"); - SolverControl solver_control(100, 1.0e-10); + SolverControl solver_control(100, 1.0e-10, false, true); SolverType solver(solver_control); PreconditionJacobi> preconditioner; @@ -148,7 +148,7 @@ test_solver(const SparseMatrix &A, const Vector &b) deallog.push("Linear operator"); const auto lo_A = linear_operator(A); - SolverControl solver_control(100, 1.0e-10); + SolverControl solver_control(100, 1.0e-10, false, true); SolverType solver(solver_control); PreconditionJacobi> preconditioner; @@ -268,7 +268,7 @@ main() "jacobi"); preconditioner.use_matrix(A); - SolverControl solver_control(100, 1.0e-10); + SolverControl solver_control(100, 1.0e-10, false, true); SolverCG> solver(solver_control); // Exact inverse @@ -357,7 +357,7 @@ main() deallog << "SolverSelector" << std::endl; const auto lo_A = linear_operator(A); - ReductionControl solver_control(10, 1.e-30, 1.e-2); + ReductionControl solver_control(10, 1.e-30, 1.e-2, false, true); SolverSelector> solver; solver.select("cg"); solver.set_control(solver_control); diff --git a/tests/lac/solver_selector_01.cc b/tests/lac/solver_selector_01.cc index 81a4040cef..82261b46fb 100644 --- a/tests/lac/solver_selector_01.cc +++ b/tests/lac/solver_selector_01.cc @@ -35,8 +35,8 @@ check(const MatrixType &A, const VectorType &f) names.push_back("gmres"); names.push_back("fgmres"); - ReductionControl cont1(100, 0., 1.e-4); - SolverControl cont2(100, 1.e-7); + ReductionControl cont1(100, 0., 1.e-4, false, true); + SolverControl cont2(100, 1.e-7, false, true); SolverSelector solver; PreconditionSSOR> pre; pre.initialize(A); diff --git a/tests/lac/solver_selector_03.cc b/tests/lac/solver_selector_03.cc index 5adcbf55e4..3a4d6b0ac3 100644 --- a/tests/lac/solver_selector_03.cc +++ b/tests/lac/solver_selector_03.cc @@ -34,7 +34,7 @@ check(const MatrixType &A, const VectorType &f) names.push_back("cg"); names.push_back("gmres"); - SolverControl cont(100, 1.e-7); + SolverControl cont(100, 1.e-7, false, true); SolverSelector solver; PreconditionSSOR> pre; pre.initialize(A); diff --git a/tests/matrix_free/multigrid_dg_periodic.cc b/tests/matrix_free/multigrid_dg_periodic.cc index c8d70b350c..686ca18b46 100644 --- a/tests/matrix_free/multigrid_dg_periodic.cc +++ b/tests/matrix_free/multigrid_dg_periodic.cc @@ -573,7 +573,7 @@ do_test(const DoFHandler &dof, const unsigned int n_q_points_1d) preconditioner(dof, mg, mg_transfer); { - ReductionControl control(30, 1e-20, 1e-10); + ReductionControl control(30, 1e-20, 1e-10, false, true); SolverCG> solver(control); solver.solve(fine_matrix, sol, in, preconditioner); }