fix muelu test output

diff --git a/tests/trilinos/precondition_muelu_dgp.cc b/tests/trilinos/precondition_muelu_dgp.cc
index 1435129757d24464356860d8e2df580cca3f1d61..696df34f9ebe4fd717044a87baa7e6bf39a53ae2 100644 (file)
--- a/tests/trilinos/precondition_muelu_dgp.cc
+++ b/tests/trilinos/precondition_muelu_dgp.cc
@@ -187,8 +187,11 @@ void Step4<dim>::solve ()
     SolverControl           solver_control (1000, 1e-10);
     SolverCG<>              solver (solver_control);
     preconditioner.initialize(system_matrix, data);
-    solver.solve (system_matrix, solution, system_rhs,
-                  preconditioner);
+
+    check_solver_within_range(
+      solver.solve (system_matrix, solution, system_rhs,
+                   preconditioner),
+      solver_control.last_step(), 18, 32);
   }
   deallog.pop();
 }

diff --git a/tests/trilinos/precondition_muelu_dgp.with_trilinos=11.14.with_64bit_indices=off.output b/tests/trilinos/precondition_muelu_dgp.with_trilinos=11.14.with_64bit_indices=off.output
index f7ee5d0889ba2acb74073d37279b7628048576cd..12e69b069ccea2fa78addd036e00e01aabe1a0be 100644 (file)
--- a/tests/trilinos/precondition_muelu_dgp.with_trilinos=11.14.with_64bit_indices=off.output
+++ b/tests/trilinos/precondition_muelu_dgp.with_trilinos=11.14.with_64bit_indices=off.output
@@ -1,5 +1,3 @@
 
-DEAL:12288:cg::Starting value 1970.22
-DEAL:12288:cg::Convergence step 19 value 0
-DEAL:49152:cg::Starting value 179304.
-DEAL:49152:cg::Convergence step 31 value 0
+DEAL:12288::Solver stopped within 18 - 32 iterations
+DEAL:49152::Solver stopped within 18 - 32 iterations

diff --git a/tests/trilinos/precondition_muelu_q_iso_q1.cc b/tests/trilinos/precondition_muelu_q_iso_q1.cc
index c4e136604308ea3a41ace99f8de78cb7f9cb5ca1..aaead6fd038e962d9869e6352679668fc23f4302 100644 (file)
--- a/tests/trilinos/precondition_muelu_q_iso_q1.cc
+++ b/tests/trilinos/precondition_muelu_q_iso_q1.cc
@@ -269,24 +269,28 @@ void Step4<dim>::solve ()
   deallog.push("MueLu_Q");
   {
     solution = 0;
-    SolverControl           solver_control (1000, 1e-12);
+    SolverControl           solver_control (1000, 1e-8);
     SolverCG<>              solver (solver_control);
     TrilinosWrappers::PreconditionAMGMueLu preconditioner;
     preconditioner.initialize(system_matrix);
-    solver.solve (system_matrix, solution, system_rhs,
-                  preconditioner);
+    check_solver_within_range(
+      solver.solve (system_matrix, solution, system_rhs,
+                   preconditioner),
+      solver_control.last_step(), 31, 33);
   }
   deallog.pop();
 
   deallog.push("MueLu_Q_iso_Q1");
   {
     solution = 0;
-    SolverControl           solver_control (1000, 1e-12);
+    SolverControl           solver_control (1000, 1e-8);
     SolverCG<>              solver (solver_control);
     TrilinosWrappers::PreconditionAMGMueLu preconditioner;
     preconditioner.initialize(preconditioner_matrix);
-    solver.solve (system_matrix, solution, system_rhs,
-                  preconditioner);
+    check_solver_within_range(
+      solver.solve (system_matrix, solution, system_rhs,
+                   preconditioner),
+      solver_control.last_step(), 36, 38);
   }
   deallog.pop();
   deallog << std::endl;

diff --git a/tests/trilinos/precondition_muelu_q_iso_q1.with_trilinos=11.14.with_64bit_indices=off.output b/tests/trilinos/precondition_muelu_q_iso_q1.with_trilinos=11.14.with_64bit_indices=off.output
index c592763f04eb4fd392af022004efb60983ce4dbb..60b5ab0bee0689a81c3de4e375797e1255d6fbd4 100644 (file)
--- a/tests/trilinos/precondition_muelu_q_iso_q1.with_trilinos=11.14.with_64bit_indices=off.output
+++ b/tests/trilinos/precondition_muelu_q_iso_q1.with_trilinos=11.14.with_64bit_indices=off.output
@@ -1,11 +1,7 @@
 
-DEAL:02401:MueLu_Q:cg::Starting value 31.4643
-DEAL:02401:MueLu_Q:cg::Convergence step 45 value 0
-DEAL:02401:MueLu_Q_iso_Q1:cg::Starting value 31.4643
-DEAL:02401:MueLu_Q_iso_Q1:cg::Convergence step 34 value 0
+DEAL:02401:MueLu_Q::Solver stopped within 31 - 33 iterations
+DEAL:02401:MueLu_Q_iso_Q1::Solver stopped within 36 - 38 iterations
 DEAL:02401::
-DEAL:09409:MueLu_Q:cg::Starting value 44.5271
-DEAL:09409:MueLu_Q:cg::Convergence step 47 value 0
-DEAL:09409:MueLu_Q_iso_Q1:cg::Starting value 44.5271
-DEAL:09409:MueLu_Q_iso_Q1:cg::Convergence step 34 value 0
+DEAL:09409:MueLu_Q::Solver stopped within 31 - 33 iterations
+DEAL:09409:MueLu_Q_iso_Q1::Solver stopped within 36 - 38 iterations
 DEAL:09409::