From: Matthias Maier <tamiko@43-1.org>
Date: Sun, 10 May 2020 23:50:32 +0000 (-0500)
Subject: Tests arpack/step-36_ar* - use solver_within_range macro
X-Git-Tag: v9.2.0-rc1~37^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfeabab6b088a606f87fa7de28eb06cfb314496d;p=dealii.git

Tests arpack/step-36_ar* - use solver_within_range macro
---

diff --git a/tests/arpack/step-36_ar.cc b/tests/arpack/step-36_ar.cc
index 267af91027..a4528c644f 100644
--- a/tests/arpack/step-36_ar.cc
+++ b/tests/arpack/step-36_ar.cc
@@ -223,12 +223,15 @@ namespace Step36
     ArpackSolver::AdditionalData additional_data(
       num_arnoldi_vectors, ArpackSolver::largest_magnitude, true);
     ArpackSolver eigensolver(solver_control, additional_data);
-    eigensolver.solve(stiffness_matrix,
-                      mass_matrix,
-                      inverse,
-                      eigenvalues,
-                      eigenfunctions,
-                      eigenvalues.size());
+    check_solver_within_range(eigensolver.solve(stiffness_matrix,
+                                                mass_matrix,
+                                                inverse,
+                                                eigenvalues,
+                                                eigenfunctions,
+                                                eigenvalues.size()),
+                              solver_control.last_step(),
+                              2,
+                              10);
 
     // make sure that we have eigenvectors and they are mass-orthonormal:
     // a) (A*x_i-\lambda*B*x_i).L2() == 0
diff --git a/tests/arpack/step-36_ar.with_umfpack=true.output b/tests/arpack/step-36_ar.with_umfpack=true.output
index b9591d254d..80459630d4 100644
--- a/tests/arpack/step-36_ar.with_umfpack=true.output
+++ b/tests/arpack/step-36_ar.with_umfpack=true.output
@@ -1,5 +1,5 @@
 
-DEAL::Convergence step 8 value 0.00000
+DEAL::Solver stopped within 2 - 10 iterations
 DEAL::      Eigenvalue 0 : (4.93877,0.00000)
 DEAL::      Eigenvalue 1 : (12.3707,0.00000)
 DEAL::      Eigenvalue 2 : (12.3707,0.00000)
diff --git a/tests/arpack/step-36_ar_with_iterations.cc b/tests/arpack/step-36_ar_with_iterations.cc
index 63165446df..7e21bc18e0 100644
--- a/tests/arpack/step-36_ar_with_iterations.cc
+++ b/tests/arpack/step-36_ar_with_iterations.cc
@@ -223,12 +223,15 @@ namespace Step36
     ArpackSolver::AdditionalData additional_data(
       num_arnoldi_vectors, ArpackSolver::largest_magnitude, true);
     ArpackSolver eigensolver(solver_control, additional_data);
-    eigensolver.solve(stiffness_matrix,
-                      mass_matrix,
-                      inverse,
-                      eigenvalues,
-                      eigenfunctions,
-                      eigenvalues.size());
+    check_solver_within_range(eigensolver.solve(stiffness_matrix,
+                                                mass_matrix,
+                                                inverse,
+                                                eigenvalues,
+                                                eigenfunctions,
+                                                eigenvalues.size()),
+                              solver_control.last_step(),
+                              2,
+                              10);
 
     // make sure that we have eigenvectors and they are mass-orthonormal:
     // a) (A*x_i-\lambda*B*x_i).L2() == 0
diff --git a/tests/arpack/step-36_ar_with_iterations.with_umfpack=true.output b/tests/arpack/step-36_ar_with_iterations.with_umfpack=true.output
index 89431ddcc6..d7c3ae04b5 100644
--- a/tests/arpack/step-36_ar_with_iterations.with_umfpack=true.output
+++ b/tests/arpack/step-36_ar_with_iterations.with_umfpack=true.output
@@ -1,5 +1,5 @@
 
-DEAL::Convergence step 8 value 0.00000
+DEAL::Solver stopped within 2 - 10 iterations
 DEAL::8 iterations used
 DEAL::      Eigenvalue 0 : (4.93877,0.00000)
 DEAL::      Eigenvalue 1 : (12.3707,0.00000)