]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Revert "Relax lac/gmres_reorthogonalize_01" 5010/head
authorMatthias Maier <tamiko@43-1.org>
Fri, 1 Sep 2017 19:49:59 +0000 (14:49 -0500)
committerMatthias Maier <tamiko@43-1.org>
Fri, 1 Sep 2017 19:49:59 +0000 (14:49 -0500)
This reverts commit b9cff2610fe93494eebef7c775fd0667b743ecf7.

tests/lac/gmres_reorthogonalize_01.cc
tests/lac/gmres_reorthogonalize_01.debug.output

index 5dcc5d9e21700a208c79c1d19ae3ec82df388d79..9f6bf861983af34c507647bc994c589356e25c0f 100644 (file)
@@ -26,7 +26,7 @@
 
 
 template <typename number>
-void test (unsigned int variant, unsigned int min_convergence_steps)
+void test (unsigned int variant)
 {
   const unsigned int n = 64;
   Vector<number> rhs(n), sol(n);
@@ -70,31 +70,30 @@ void test (unsigned int variant, unsigned int min_convergence_steps)
   data.max_n_tmp_vectors = 80;
 
   SolverGMRES<Vector<number> > solver(control, data);
-
-  check_solver_within_range
-  (solver.solve(matrix, sol, rhs, PreconditionIdentity()),
-   control.last_step(), min_convergence_steps, min_convergence_steps+2);
+  solver.solve(matrix, sol, rhs, PreconditionIdentity());
 
   deallog.pop();
 }
 
 int main()
 {
-  initlog();
+  std::ofstream logfile("output");
+  deallog << std::setprecision(3);
+  deallog.attach(logfile);
 
   deallog.push("double");
-  test<double>(0, 56);
-  test<double>(1, 64);
-  test<double>(2, 56);
-  test<double>(3, 64);
-  test<double>(4, 56);
-  test<double>(5, 64);
+  test<double>(0);
+  test<double>(1);
+  test<double>(2);
+  test<double>(3);
+  test<double>(4);
+  test<double>(5);
   deallog.pop();
   deallog.push("float");
-  test<float>(0, 36);
-  test<float>(1, 64);
-  test<float>(2, 36);
-  test<float>(3, 64);
+  test<float>(0);
+  test<float>(1);
+  test<float>(2);
+  test<float>(3);
   deallog.pop();
 }
 
index 5ec7df72ffdbcab074250cfadff881818ba82fb0..9f9b65c3c1f31770408b26fd90a9aa1ee7fb8333 100644 (file)
@@ -1,11 +1,26 @@
 
-DEAL:double:0::Solver stopped within 56 - 58 iterations
-DEAL:double:1::Solver stopped within 64 - 66 iterations
-DEAL:double:2::Solver stopped within 56 - 58 iterations
-DEAL:double:3::Solver stopped within 64 - 66 iterations
-DEAL:double:4::Solver stopped within 56 - 58 iterations
-DEAL:double:5::Solver stopped within 64 - 66 iterations
-DEAL:float:0::Solver stopped within 36 - 38 iterations
-DEAL:float:1::Solver stopped within 64 - 66 iterations
-DEAL:float:2::Solver stopped within 36 - 38 iterations
-DEAL:float:3::Solver stopped within 64 - 66 iterations
+DEAL:double:0:GMRES::Starting value 8.00
+DEAL:double:0:GMRES::Convergence step 57 value 1.62e-14
+DEAL:double:1:GMRES::Starting value 8.00
+DEAL:double:1:GMRES::Re-orthogonalization enabled at step 65
+DEAL:double:1:GMRES::Convergence step 65 value 1.04e-23
+DEAL:double:2:GMRES::Starting value 8.00
+DEAL:double:2:GMRES::Convergence step 57 value 1.72e-14
+DEAL:double:3:GMRES::Starting value 8.00
+DEAL:double:3:GMRES::Re-orthogonalization enabled at step 65
+DEAL:double:3:GMRES::Convergence step 65 value 2.56e-24
+DEAL:double:4:GMRES::Starting value 8.00
+DEAL:double:4:GMRES::Convergence step 57 value 1.59e-14
+DEAL:double:5:GMRES::Starting value 8.00
+DEAL:double:5:GMRES::Re-orthogonalization enabled at step 65
+DEAL:double:5:GMRES::Convergence step 65 value 1.96e-24
+DEAL:float:0:GMRES::Starting value 8.00
+DEAL:float:0:GMRES::Convergence step 37 value 7.73e-06
+DEAL:float:1:GMRES::Starting value 8.00
+DEAL:float:1:GMRES::Re-orthogonalization enabled at step 65
+DEAL:float:1:GMRES::Convergence step 65 value 1.11e-05
+DEAL:float:2:GMRES::Starting value 8.00
+DEAL:float:2:GMRES::Convergence step 37 value 6.87e-06
+DEAL:float:3:GMRES::Starting value 8.00
+DEAL:float:3:GMRES::Re-orthogonalization enabled at step 65
+DEAL:float:3:GMRES::Convergence step 66 value 3.27e-10

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.