Make the output of petsc_solver_(02|11) more robust

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31338 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/petsc/solver_02.cc b/tests/petsc/solver_02.cc
index 2f8f6a04e0baa3c28a8cd9a4f6ad9c22b1b9d0bf..0a49a88c5c8fd5e20232c97f15a870e5dd83840d 100644 (file)
--- a/tests/petsc/solver_02.cc
+++ b/tests/petsc/solver_02.cc
@@ -45,11 +45,11 @@ check_solve( SOLVER &solver, const MATRIX &A,
     {
       solver.solve(A,u,f,P);
     }
-  catch (std::exception &e)
+  catch (dealii::SolverControl::NoConvergence &e)
     {
-      deallog << e.what() << std::endl;
-      // just like for Richardson: we end up
-      // here normally for this solver
+      // just like for Richardson: expect to
+      // get here, don't abort the program
+      deallog << "Catched exception dealii::SolverControl::NoConvergence" << std::endl;
     }
 
   deallog << "Solver stopped after " << solver.control().last_step()

diff --git a/tests/petsc/solver_02.output b/tests/petsc/solver_02.output
index 47abf08e1108fbc2ee8be78d46f0382ef89995dd..451d0391cc8d307eff66e608d342f0ce10f0eb6b 100644 (file)
--- a/tests/petsc/solver_02.output
+++ b/tests/petsc/solver_02.output
@@ -2,6 +2,6 @@
 DEAL::Size 32 Unknowns 961
 DEAL::Solver type: N6dealii13PETScWrappers15SolverChebychevE
 DEAL::Starting value 7.551
-DEAL::Failure step 100 value 2.942
-DEAL::Iterative method reported convergence failure in step 100 with residual 2.94179
+DEAL::Failure step 100 value 2.937
+DEAL::Catched exception dealii::SolverControl::NoConvergence
 DEAL::Solver stopped after 100 iterations

diff --git a/tests/petsc/solver_11.cc b/tests/petsc/solver_11.cc
index dc40e6a01f464609085b81d9265aee04efffc10f..a7e585eb330d37e5f604f40d08a541644426e4ec 100644 (file)
--- a/tests/petsc/solver_11.cc
+++ b/tests/petsc/solver_11.cc
@@ -45,11 +45,11 @@ check_solve( SOLVER &solver, const MATRIX &A,
     {
       solver.solve(A,u,f,P);
     }
-  catch (std::exception &e)
+  catch (dealii::SolverControl::NoConvergence &e)
     {
-      deallog << e.what() << std::endl;
       // just like for Richardson: expect to
       // get here, don't abort the program
+      deallog << "Catched exception dealii::SolverControl::NoConvergence" << std::endl;
     }
 
   deallog << "Solver stopped after " << solver.control().last_step()

diff --git a/tests/petsc/solver_11.output b/tests/petsc/solver_11.output
index d25315736572ec5517a0ee112d57ffc2e1f93ae4..b5aa43b0774d17dd9ea0b0d764061bebf44b400c 100644 (file)
--- a/tests/petsc/solver_11.output
+++ b/tests/petsc/solver_11.output
@@ -3,5 +3,5 @@ DEAL::Size 32 Unknowns 961
 DEAL::Solver type: N6dealii13PETScWrappers10SolverLSQRE
 DEAL::Starting value 31.00
 DEAL::Failure step 100 value 24.02
-DEAL::Iterative method reported convergence failure in step 100 with residual 24.0171
+DEAL::Catched exception dealii::SolverControl::NoConvergence
 DEAL::Solver stopped after 100 iterations