Slightly decrease solver tolerance in lac/gmres_eigenvalues

diff --git a/tests/lac/gmres_eigenvalues.cc b/tests/lac/gmres_eigenvalues.cc
index 552aeeb0072f7ebe409a57b773d5c7699985bb0a..0eec36f281a49a722053007a913b426ac74db018 100644 (file)
--- a/tests/lac/gmres_eigenvalues.cc
+++ b/tests/lac/gmres_eigenvalues.cc
@@ -72,9 +72,9 @@ void test (unsigned int variant)
 
   deallog.push(Utilities::int_to_string(variant,1));
 
-  SolverControl control(1000, variant==1?1e-4:1e-13);
+  SolverControl control(1000, variant==1?1e-4:1e-15);
   typename SolverGMRES<Vector<number> >::AdditionalData data;
-  data.max_n_tmp_vectors = 80;
+  data.max_n_tmp_vectors = 100;
 
   SolverGMRES<Vector<number> > solver(control, data);
   solver.connect_eigenvalues_slot(
@@ -113,7 +113,7 @@ void test (unsigned int variant)
 int main()
 {
   std::ofstream logfile("output");
-  deallog << std::setprecision(2);
+  deallog << std::setprecision(10);
   deallog.attach(logfile);
 
   deallog.push("double");

diff --git a/tests/lac/gmres_eigenvalues.with_lapack=true.output b/tests/lac/gmres_eigenvalues.with_lapack=true.output
index 1b6aa8eb44f2bbc3a690fef48c3e12ca34232fa6..0701d10667e3fe177b80608f6215f1d9026fc9a5 100644 (file)
--- a/tests/lac/gmres_eigenvalues.with_lapack=true.output
+++ b/tests/lac/gmres_eigenvalues.with_lapack=true.output
@@ -1,17 +1,17 @@
 
-DEAL:double:0:GMRES::Starting value 8.0
-DEAL:double:0:GMRES::Convergence step 56 value 0
-DEAL:double:0:GMRES::Eigenvalue estimate:  (1.0,0.0) (2.0,0.0) (3.0,0.0) (4.0,0.0) (5.0,0.0) (6.0,0.0) (7.0,0.0) (8.0,0.0) (9.0,0.0) (10.,0.0) (11.,0.0) (12.,0.0) (13.,0.0) (14.,0.0) (15.,0.0) (16.,0.0) (17.,0.0) (18.,0.0) (19.,0.0) (21.,0.0) (22.,0.0) (23.,0.0) (25.,0.0) (26.,0.0) (27.,0.0) (29.,0.0) (30.,0.0) (32.,0.0) (33.,0.0) (35.,0.0) (36.,0.0) (38.,0.0) (39.,0.0) (40.,0.0) (42.,0.0) (43.,0.0) (44.,0.0) (46.,0.0) (47.,0.0) (48.,0.0) (49.,0.0) (50.,0.0) (51.,0.0) (52.,0.0) (53.,0.0) (54.,0.0) (55.,0.0) (56.,0.0) (57.,0.0) (58.,0.0) (59.,0.0) (60.,0.0) (61.,0.0) (62.,0.0) (63.,0.0) (64.,0.0)
-DEAL:double:0:cg::Starting value 8.0
-DEAL:double:0:cg::Convergence step 56 value 0
-DEAL:double:0:cg::Eigenvalue estimate:  1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10. 11. 12. 13. 14. 15. 16. 17. 18. 20. 21. 22. 24. 25. 27. 28. 30. 31. 33. 34. 35. 37. 38. 40. 41. 43. 44. 45. 47. 48. 49. 50. 51. 52. 53. 54. 55. 56. 57. 58. 59. 60. 61. 62. 63. 64.
-DEAL:double:1:GMRES::Starting value 4.0
-DEAL:double:1:GMRES::Convergence step 16 value 0
-DEAL:double:1:GMRES::Eigenvalue estimate:  (1.0,0.0) (16.,0.0) (81.,0.0) (2.6e+02,0.0) (6.3e+02,0.0) (1.3e+03,0.0) (2.4e+03,0.0) (4.1e+03,0.0) (6.6e+03,0.0) (1.0e+04,0.0) (1.5e+04,0.0) (2.1e+04,0.0) (2.9e+04,0.0) (3.8e+04,0.0) (5.1e+04,0.0) (6.6e+04,0.0)
-DEAL:double:2:GMRES::Starting value 8.0
-DEAL:double:2:GMRES::Convergence step 64 value 0
-DEAL:double:2:GMRES::Eigenvalue estimate:  (-63.,0.0) (-61.,0.0) (-59.,0.0) (-57.,0.0) (-55.,0.0) (-53.,0.0) (-51.,0.0) (-49.,0.0) (-47.,0.0) (-45.,0.0) (-43.,0.0) (-41.,0.0) (-39.,0.0) (-37.,0.0) (-35.,0.0) (-33.,0.0) (-31.,0.0) (-29.,0.0) (-27.,0.0) (-25.,0.0) (-23.,0.0) (-21.,0.0) (-19.,0.0) (-17.,0.0) (-15.,0.0) (-13.,0.0) (-11.,0.0) (-9.0,0.0) (-7.0,0.0) (-5.0,0.0) (-3.0,0.0) (-1.0,0.0) (2.0,0.0) (4.0,0.0) (6.0,0.0) (8.0,0.0) (10.,0.0) (12.,0.0) (14.,0.0) (16.,0.0) (18.,0.0) (20.,0.0) (22.,0.0) (24.,0.0) (26.,0.0) (28.,0.0) (30.,0.0) (32.,0.0) (34.,0.0) (36.,0.0) (38.,0.0) (40.,0.0) (42.,0.0) (44.,0.0) (46.,0.0) (48.,0.0) (50.,0.0) (52.,0.0) (54.,0.0) (56.,0.0) (58.,0.0) (60.,0.0) (62.,0.0) (64.,0.0)
-DEAL:double:3:GMRES::Starting value 4.0
-DEAL:double:3:GMRES::Convergence step 16 value 0
-DEAL:double:3:GMRES::Eigenvalue estimate:  (0.27,-1.1) (0.27,1.1) (1.5,-3.8) (1.5,3.8) (2.8,-3.7) (2.8,3.7) (4.5,-4.1) (4.5,4.1) (7.2,-5.4) (7.2,5.4) (10.,-6.0) (10.,6.0) (14.,-5.9) (14.,5.9) (19.,-4.1) (19.,4.1)
-DEAL:double:3::Actual eigenvalues:         (0.27,-1.1) (0.27,1.1) (1.5,-3.8) (1.5,3.8) (2.8,-3.7) (2.8,3.7) (4.5,-4.1) (4.5,4.1) (7.2,-5.4) (7.2,5.4) (10.,-6.0) (10.,6.0) (14.,-5.9) (14.,5.9) (19.,-4.1) (19.,4.1)
+DEAL:double:0:GMRES::Starting value 8.000000000
+DEAL:double:0:GMRES::Convergence step 65 value 3.128687318e-29
+DEAL:double:0:GMRES::Eigenvalue estimate:  (-9.043798686e-16,0.000000000) (1.000000000,0.000000000) (2.000000000,0.000000000) (3.000000000,0.000000000) (4.000000000,0.000000000) (5.000000000,0.000000000) (6.000000000,0.000000000) (7.000000000,0.000000000) (8.000000000,0.000000000) (9.000000000,0.000000000) (10.00000000,0.000000000) (11.00000000,0.000000000) (12.00000000,0.000000000) (13.00000000,0.000000000) (14.00000000,0.000000000) (15.00000000,0.000000000) (16.00000000,0.000000000) (17.00000000,0.000000000) (18.00000000,0.000000000) (19.00000000,0.000000000) (20.00000000,0.000000000) (21.00000000,0.000000000) (22.00000000,0.000000000) (23.00000000,0.000000000) (24.00000000,0.000000000) (25.00000000,0.000000000) (26.00000000,0.000000000) (27.00000000,0.000000000) (28.00000000,0.000000000) (29.00000000,0.000000000) (30.00000000,0.000000000) (31.00000000,0.000000000) (32.00000000,0.000000000) (33.00000000,0.000000000) (34.00000000,0.000000000) (35.00000000,0.000000000) (36.00000000,0.000000000) (37.00000000,0.000000000) (38.00000000,0.000000000) (39.00000000,0.000000000) (40.00000000,0.000000000) (41.00000000,0.000000000) (42.00000000,0.000000000) (43.00000000,0.000000000) (44.00000000,0.000000000) (45.00000000,0.000000000) (46.00000000,0.000000000) (47.00000000,0.000000000) (48.00000000,0.000000000) (49.00000000,0.000000000) (50.00000000,0.000000000) (51.00000000,0.000000000) (52.00000000,0.000000000) (53.00000000,0.000000000) (54.00000000,0.000000000) (55.00000000,0.000000000) (56.00000000,0.000000000) (57.00000000,0.000000000) (58.00000000,0.000000000) (59.00000000,0.000000000) (60.00000000,0.000000000) (61.00000000,0.000000000) (62.00000000,0.000000000) (63.00000000,0.000000000) (64.00000000,0.000000000)
+DEAL:double:0:cg::Starting value 8.000000000
+DEAL:double:0:cg::Convergence step 59 value 6.813229079e-16
+DEAL:double:0:cg::Eigenvalue estimate:  1.000000000 2.000000000 3.000000000 4.000000000 5.000000000 6.000000000 7.000000000 8.000000000 9.000000001 10.00000001 11.00000020 12.00000251 13.00002497 14.00019419 15.00117887 16.00555763 17.02025697 18.05750489 19.13068896 20.24810850 21.41118642 22.61686166 23.86022811 25.13592486 26.43863511 27.76320267 29.10462361 30.45800841 31.81854331 33.18145702 34.54199190 35.89537670 37.23679763 38.56136517 39.86407541 41.13977214 42.38313856 43.58881376 44.75189164 45.86931113 46.94249517 47.97974306 48.99444238 49.99882114 50.99980581 51.99997503 52.99999749 53.99999980 54.99999999 56.00000000 57.00000000 58.00000000 59.00000000 60.00000000 61.00000000 62.00000000 63.00000000 64.00000000
+DEAL:double:1:GMRES::Starting value 4.000000000
+DEAL:double:1:GMRES::Convergence step 16 value 2.059370821e-12
+DEAL:double:1:GMRES::Eigenvalue estimate:  (1.001000000,0.000000000) (16.01600000,0.000000000) (81.08100000,0.000000000) (256.2560000,0.000000000) (625.6250000,0.000000000) (1297.296000,0.000000000) (2403.401000,0.000000000) (4100.096000,0.000000000) (6567.561000,0.000000000) (10010.00000,0.000000000) (14655.64100,0.000000000) (20756.73600,0.000000000) (28589.56100,0.000000000) (38454.41600,0.000000000) (50675.62500,0.000000000) (65601.53600,0.000000000)
+DEAL:double:2:GMRES::Starting value 8.000000000
+DEAL:double:2:GMRES::Convergence step 65 value 2.116664042e-29
+DEAL:double:2:GMRES::Eigenvalue estimate:  (-63.00000000,0.000000000) (-61.00000000,0.000000000) (-59.00000000,0.000000000) (-57.00000000,0.000000000) (-55.00000000,0.000000000) (-53.00000000,0.000000000) (-51.00000000,0.000000000) (-49.00000000,0.000000000) (-47.00000000,0.000000000) (-45.00000000,0.000000000) (-43.00000000,0.000000000) (-41.00000000,0.000000000) (-39.00000000,0.000000000) (-37.00000000,0.000000000) (-35.00000000,0.000000000) (-33.00000000,0.000000000) (-31.00000000,0.000000000) (-29.00000000,0.000000000) (-27.00000000,0.000000000) (-25.00000000,0.000000000) (-23.00000000,0.000000000) (-21.00000000,0.000000000) (-19.00000000,0.000000000) (-17.00000000,0.000000000) (-15.00000000,0.000000000) (-13.00000000,0.000000000) (-11.00000000,0.000000000) (-9.000000000,0.000000000) (-7.000000000,0.000000000) (-5.000000000,0.000000000) (-3.000000000,0.000000000) (-1.000000000,0.000000000) (-1.866591586e-15,0.000000000) (2.000000000,0.000000000) (4.000000000,0.000000000) (6.000000000,0.000000000) (8.000000000,0.000000000) (10.00000000,0.000000000) (12.00000000,0.000000000) (14.00000000,0.000000000) (16.00000000,0.000000000) (18.00000000,0.000000000) (20.00000000,0.000000000) (22.00000000,0.000000000) (24.00000000,0.000000000) (26.00000000,0.000000000) (28.00000000,0.000000000) (30.00000000,0.000000000) (32.00000000,0.000000000) (34.00000000,0.000000000) (36.00000000,0.000000000) (38.00000000,0.000000000) (40.00000000,0.000000000) (42.00000000,0.000000000) (44.00000000,0.000000000) (46.00000000,0.000000000) (48.00000000,0.000000000) (50.00000000,0.000000000) (52.00000000,0.000000000) (54.00000000,0.000000000) (56.00000000,0.000000000) (58.00000000,0.000000000) (60.00000000,0.000000000) (62.00000000,0.000000000) (64.00000000,0.000000000)
+DEAL:double:3:GMRES::Starting value 4.000000000
+DEAL:double:3:GMRES::Convergence step 20 value 5.460183135e-30
+DEAL:double:3:GMRES::Eigenvalue estimate:  (-5.810337659e-16,-5.026887352e-16) (-5.810337659e-16,5.026887352e-16) (4.390738627e-16,0.000000000) (1.059398453e-15,0.000000000) (0.2721368793,-1.141629651) (0.2721368793,1.141629651) (1.524881768,-3.808490348) (1.524881768,3.808490348) (2.808060005,-3.706443363) (2.808060005,3.706443363) (4.495975596,-4.110246191) (4.495975596,4.110246191) (7.175640490,-5.379965252) (7.175640490,5.379965252) (10.26076740,-5.975843074) (10.26076740,5.975843074) (13.93423683,-5.924460400) (13.93423683,5.924460400) (18.52830103,-4.066775001) (18.52830103,4.066775001)
+DEAL:double:3::Actual eigenvalues:         (0.2721368793,-1.141629651) (0.2721368793,1.141629651) (1.524881768,-3.808490348) (1.524881768,3.808490348) (2.808060005,-3.706443363) (2.808060005,3.706443363) (4.495975596,-4.110246191) (4.495975596,4.110246191) (7.175640490,-5.379965252) (7.175640490,5.379965252) (10.26076740,-5.975843074) (10.26076740,5.975843074) (13.93423683,-5.924460400) (13.93423683,5.924460400) (18.52830103,-4.066775001) (18.52830103,4.066775001)