Try to avoid differences in roundoff by using weaker tolerance for Bicgstab solver

git-svn-id: https://svn.dealii.org/trunk@33118 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/trilinos/precondition.cc b/tests/trilinos/precondition.cc
index 2ec84a425155a6d23a01033525cbc01096138a3d..0430f6bb47e2a4c3db540cd76e7d0ca758909591 100644 (file)
--- a/tests/trilinos/precondition.cc
+++ b/tests/trilinos/precondition.cc
@@ -237,7 +237,7 @@ void Step4<dim>::solve ()
     deallog.push("SOR");
     TrilinosWrappers::PreconditionSOR preconditioner;
     solution = 0;
-    SolverControl           solver_control (1000, 1e-10);
+    SolverControl           solver_control (1000, 1e-5);
     SolverBicgstab<>        solver (solver_control);
     preconditioner.initialize(system_matrix);
     solver.solve (system_matrix, solution, system_rhs,
@@ -281,7 +281,7 @@ void Step4<dim>::solve ()
     data.block_size = 4;
     data.omega = 0.8;
     solution = 0;
-    SolverControl           solver_control (1000, 1e-10);
+    SolverControl           solver_control (1000, 1e-5);
     SolverBicgstab<>        solver (solver_control);
     preconditioner.initialize(system_matrix, data);
     solver.solve (system_matrix, solution, system_rhs,
@@ -320,7 +320,7 @@ void Step4<dim>::solve ()
     data.ilut_drop = 1e-6;
     data.ilut_fill = 3;
     solution = 0;
-    SolverControl           solver_control (1000, 1e-10);
+    SolverControl           solver_control (1000, 1e-5);
     SolverBicgstab<>        solver (solver_control);
     preconditioner.initialize(system_matrix, data);
     solver.solve (system_matrix, solution, system_rhs,
@@ -383,7 +383,7 @@ int main (int argc, char **argv)
   std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
-  deallog.threshold_double(1.e-10);
+  deallog.threshold_double(1.e-5);
 
   Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv);
 

diff --git a/tests/trilinos/precondition.output b/tests/trilinos/precondition.output
index 395cc23bffb6ae6c5d78e2a4a274514eb30178ec..8e2a7ac4479c0f29f4632f7d158c4de8c22bea97 100644 (file)
--- a/tests/trilinos/precondition.output
+++ b/tests/trilinos/precondition.output
@@ -4,19 +4,19 @@ DEAL:04225:Jacobi:cg::Convergence step 101 value 0
 DEAL:04225:SSOR:cg::Starting value 21.8299
 DEAL:04225:SSOR:cg::Convergence step 78 value 0
 DEAL:04225:SOR:Bicgstab::Starting value 21.8299
-DEAL:04225:SOR:Bicgstab::Convergence step 98 value 0
+DEAL:04225:SOR:Bicgstab::Convergence step 63 value 0
 DEAL:04225:BlockJacobi:cg::Starting value 21.8299
 DEAL:04225:BlockJacobi:cg::Convergence step 163 value 0
 DEAL:04225:BlockSSOR:cg::Starting value 21.8299
 DEAL:04225:BlockSSOR:cg::Convergence step 60 value 0
 DEAL:04225:BlockSOR:Bicgstab::Starting value 21.8299
-DEAL:04225:BlockSOR:Bicgstab::Convergence step 85 value 0
+DEAL:04225:BlockSOR:Bicgstab::Convergence step 54 value 0
 DEAL:04225:IC:cg::Starting value 21.8299
 DEAL:04225:IC:cg::Convergence step 70 value 0
 DEAL:04225:ILU:cg::Starting value 21.8299
 DEAL:04225:ILU:cg::Convergence step 57 value 0
 DEAL:04225:ILUT:Bicgstab::Starting value 21.8299
-DEAL:04225:ILUT:Bicgstab::Convergence step 32 value 0
+DEAL:04225:ILUT:Bicgstab::Convergence step 20 value 0
 DEAL:04225:Chebyshev:cg::Starting value 21.8299
 DEAL:04225:Chebyshev:cg::Convergence step 47 value 0
 DEAL:04225:Direct:cg::Starting value 21.8299
@@ -26,19 +26,19 @@ DEAL:16641:Jacobi:cg::Convergence step 201 value 0
 DEAL:16641:SSOR:cg::Starting value 30.8770
 DEAL:16641:SSOR:cg::Convergence step 141 value 0
 DEAL:16641:SOR:Bicgstab::Starting value 30.8770
-DEAL:16641:SOR:Bicgstab::Convergence step 209 value 0
+DEAL:16641:SOR:Bicgstab::Convergence step 140 value 0
 DEAL:16641:BlockJacobi:cg::Starting value 30.8770
 DEAL:16641:BlockJacobi:cg::Convergence step 321 value 0
 DEAL:16641:BlockSSOR:cg::Starting value 30.8770
 DEAL:16641:BlockSSOR:cg::Convergence step 117 value 0
 DEAL:16641:BlockSOR:Bicgstab::Starting value 30.8770
-DEAL:16641:BlockSOR:Bicgstab::Convergence step 173 value 0
+DEAL:16641:BlockSOR:Bicgstab::Convergence step 104 value 0
 DEAL:16641:IC:cg::Starting value 30.8770
 DEAL:16641:IC:cg::Convergence step 134 value 0
 DEAL:16641:ILU:cg::Starting value 30.8770
 DEAL:16641:ILU:cg::Convergence step 110 value 0
 DEAL:16641:ILUT:Bicgstab::Starting value 30.8770
-DEAL:16641:ILUT:Bicgstab::Convergence step 59 value 0
+DEAL:16641:ILUT:Bicgstab::Convergence step 36 value 0
 DEAL:16641:Chebyshev:cg::Starting value 30.8770
 DEAL:16641:Chebyshev:cg::Convergence step 94 value 0
 DEAL:16641:Direct:cg::Starting value 30.8770