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 267af910271bc5e90b5bc44ef78b54de3c411b02..a4528c644fdfe1154cd420285e1caf74b3f3f509 100644 (file)
--- 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 b9591d254dc5a7a004772929adc91be028b8e0bc..80459630d4ca68ac132d45f4b9332125627c26f0 100644 (file)
--- 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 63165446df2b6972be4f6333af5b2047a549897d..7e21bc18e021310f8b63c82c47a1b930cf8dabc0 100644 (file)
--- 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 89431ddcc6a7c0f34978726de9f8a032b17c3a38..d7c3ae04b5a9dec1a61e0641741fd33e67623676 100644 (file)
--- 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)