]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Explicitly re-enable output for some tests.
authorWolfgang Bangerth <bangerth@colostate.edu>
Mon, 27 Jan 2025 20:39:13 +0000 (13:39 -0700)
committerWolfgang Bangerth <bangerth@colostate.edu>
Mon, 27 Jan 2025 20:39:13 +0000 (13:39 -0700)
tests/lac/gmres_reorthogonalize_02.cc
tests/lac/iteration_number_control.cc
tests/lac/linear_operator_08.cc
tests/lac/solver_selector_01.cc
tests/lac/solver_selector_03.cc
tests/matrix_free/multigrid_dg_periodic.cc

index b7624ce60d3d9aa0c0aae8b489ae98c972277101..50a1af9bb5de2fbbbdb3db57a7a6c738f57d6870 100644 (file)
@@ -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<number>::epsilon());
+  SolverControl                                        control(1000,
+                        1e3 * std::numeric_limits<number>::epsilon(),
+                        false,
+                        true);
   typename SolverGMRES<Vector<number>>::AdditionalData data;
   data.max_basis_size = 200;
   data.orthogonalization_strategy =
index 04e2ea4c9f95343d66f09ec7209637fcbdb21a1c..04e3e5df0a411d3fada99c6b966e4e9e67ef3341 100644 (file)
@@ -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());
index 30c6c1a7a3a88bfeee16e41a63e0861338a1e02f..a33de5f9be433cbb858151c2c440e8a955534e61 100644 (file)
@@ -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<VectorType> solver(solver_control);
 
   // Exact inverse
@@ -98,7 +98,7 @@ test_preconditioner(const SparseMatrix<double>                    &A,
   // Exact inverse
   {
     deallog.push("Exact inverse");
-    SolverControl            solver_control(100, 1.0e-10);
+    SolverControl            solver_control(100, 1.0e-10, false, true);
     SolverCG<Vector<double>> solver(solver_control);
     const auto lo_A_inv = inverse_operator(lo_A, solver, preconditioner);
 
@@ -130,7 +130,7 @@ test_solver(const SparseMatrix<double> &A, const Vector<double> &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<SparseMatrix<double>> preconditioner;
@@ -148,7 +148,7 @@ test_solver(const SparseMatrix<double> &A, const Vector<double> &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<SparseMatrix<double>> 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<Vector<double>> 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<Vector<double>> solver;
       solver.select("cg");
       solver.set_control(solver_control);
index 81a4040ceff8a64a4f353312b8cbdd5bf3066ce3..82261b46fbc1f1b4dd8d2fc0be6ce1dacc35be9f 100644 (file)
@@ -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<VectorType>             solver;
   PreconditionSSOR<SparseMatrix<double>> pre;
   pre.initialize(A);
index 5adcbf55e4ec20ac1bd0a192ab08b7b260bc2dd3..3a4d6b0ac37126fa58246c702d00b0de36b43537 100644 (file)
@@ -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<VectorType>             solver;
   PreconditionSSOR<SparseMatrix<double>> pre;
   pre.initialize(A);
index c8d70b350cd3b19df7817f3b44be801b5ef5bf3e..686ca18b4684f4ca85b8f46512c6b5717e8fdd02 100644 (file)
@@ -573,7 +573,7 @@ do_test(const DoFHandler<dim> &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<LinearAlgebra::distributed::Vector<double>> solver(control);
     solver.solve(fine_matrix, sol, in, preconditioner);
   }

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.