From 85eb01e42006d131bcfe5af0029acbb1c785156a Mon Sep 17 00:00:00 2001
From: Matthias Maier <tamiko@43-1.org>
Date: Thu, 7 May 2020 18:39:38 -0500
Subject: [PATCH] arpack/step-36_ar_shift: use solver_within_range macro

---
 tests/arpack/step-36_ar_shift.cc                 | 16 ++++++++++------
 ...hift.debug.output => step-36_ar_shift.output} |  2 +-
 tests/arpack/step-36_ar_shift.release.output     |  7 -------
 3 files changed, 11 insertions(+), 14 deletions(-)
 rename tests/arpack/{step-36_ar_shift.debug.output => step-36_ar_shift.output} (83%)
 delete mode 100644 tests/arpack/step-36_ar_shift.release.output

diff --git a/tests/arpack/step-36_ar_shift.cc b/tests/arpack/step-36_ar_shift.cc
index 7a07c3a2b0..117b90efd9 100644
--- 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 255fdfd3f4..80459630d4 100644
--- 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
index b9591d254d..0000000000
--- 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)
-- 
2.39.5