arpack/step-36_ar_shift: use solver_within_range macro

diff --git a/tests/arpack/step-36_ar_shift.cc b/tests/arpack/step-36_ar_shift.cc
index 7a07c3a2b0c8c5f77daddb52fbd8a25ef968cb18..117b90efd99d6f438e53d8f12eec3a9ba35aa8e9 100644 (file)
--- a/tests/arpack/step-36_ar_shift.cc
+++ b/tests/arpack/step-36_ar_shift.cc
@@ -226,12 +226,16 @@ namespace Step36
       num_arnoldi_vectors, ArpackSolver::largest_magnitude, true);
     ArpackSolver eigensolver(solver_control, additional_data);
     eigensolver.set_shift(shift);
-    eigensolver.solve(stiffness_matrix,
-                      mass_matrix,
-                      op_shift_invert,
-                      eigenvalues,
-                      eigenfunctions,
-                      eigenvalues.size());
+
+    check_solver_within_range(eigensolver.solve(stiffness_matrix,
+                                                mass_matrix,
+                                                op_shift_invert,
+                                                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_shift.debug.output b/tests/arpack/step-36_ar_shift.output
similarity index 83%
rename from tests/arpack/step-36_ar_shift.debug.output
rename to tests/arpack/step-36_ar_shift.output
index 255fdfd3f4a08659852708b1602ae959d44554a9..80459630d4ca68ac132d45f4b9332125627c26f0 100644 (file)
--- a/tests/arpack/step-36_ar_shift.debug.output
+++ b/tests/arpack/step-36_ar_shift.output
@@ -1,5 +1,5 @@
 
-DEAL::Convergence step 4 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_shift.release.output b/tests/arpack/step-36_ar_shift.release.output
deleted file mode 100644 (file)
index b9591d2..0000000
--- a/tests/arpack/step-36_ar_shift.release.output
+++ /dev/null
@@ -1,7 +0,0 @@
-
-DEAL::Convergence step 8 value 0.00000
-DEAL::      Eigenvalue 0 : (4.93877,0.00000)
-DEAL::      Eigenvalue 1 : (12.3707,0.00000)
-DEAL::      Eigenvalue 2 : (12.3707,0.00000)
-DEAL::      Eigenvalue 3 : (19.8027,0.00000)
-DEAL::      Eigenvalue 4 : (24.8370,0.00000)