]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix some more Trilinos tests. Currently, the Bicgstab and the TFQMR solver fail,...
authorMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Mon, 23 Nov 2009 05:36:02 +0000 (05:36 +0000)
committerMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Mon, 23 Nov 2009 05:36:02 +0000 (05:36 +0000)
git-svn-id: https://svn.dealii.org/trunk@20152 0785d39b-7218-0410-832d-ea1e28bc413d

20 files changed:
tests/trilinos/deal_solver_01.cc
tests/trilinos/deal_solver_01/cmp/generic
tests/trilinos/deal_solver_02.cc
tests/trilinos/deal_solver_02/cmp/generic
tests/trilinos/deal_solver_03.cc
tests/trilinos/deal_solver_03/cmp/generic
tests/trilinos/deal_solver_04.cc
tests/trilinos/deal_solver_04/cmp/generic
tests/trilinos/deal_solver_05.cc
tests/trilinos/deal_solver_05/cmp/generic
tests/trilinos/deal_solver_06.cc
tests/trilinos/deal_solver_06/cmp/generic
tests/trilinos/solver_03.cc
tests/trilinos/solver_03/cmp/generic
tests/trilinos/solver_05.cc
tests/trilinos/solver_05/cmp/generic
tests/trilinos/solver_06.cc
tests/trilinos/solver_07.cc
tests/trilinos/solver_07/cmp/generic
tests/trilinos/solver_08.cc

index 4aff093bb33dcc9dfb796265543b0844c1e0c339..f380c4508d667a787c8ef8bb408debe86eb2abd4 100644 (file)
@@ -79,7 +79,10 @@ int main(int argc, char **argv)
       
                                      // Make matrix
     FDMatrix testproblem(size, size);
-    TrilinosWrappers::SparseMatrix  A(dim, dim, 5U);
+    CompressedSimpleSparsityPattern csp (dim, dim);
+    testproblem.five_point_structure(csp);
+    TrilinosWrappers::SparseMatrix  A;
+    A.reinit(csp);
     testproblem.five_point(A);
 
     TrilinosWrappers::Vector  f(dim);
index 1de0dcccf5896457e56ea6b3cff17f8950591da8..2e7eaf8b3b02d5577103e091ccd6e888a9cda2f0 100644 (file)
@@ -2,5 +2,5 @@
 DEAL::Size 32 Unknowns 961
 DEAL::Solver type: N6dealii8SolverCGINS_16TrilinosWrappers6VectorEEE
 DEAL:cg::Starting value 31.0000
-DEAL:cg::Convergence step 128 value 0.000807536
-DEAL::Solver stopped after 128 iterations
+DEAL:cg::Convergence step 43 value 0.000818932
+DEAL::Solver stopped after 43 iterations
index ed15c6c55bc1be9bdaf55b36e4313ad265900f71..a1b972a671d4e379c2f9df09679bd120926b70de 100644 (file)
@@ -81,7 +81,10 @@ int main(int argc, char **argv)
       
                                      // Make matrix
     FDMatrix testproblem(size, size);
-    TrilinosWrappers::SparseMatrix  A(dim, dim, 5U);
+    CompressedSimpleSparsityPattern csp (dim, dim);
+    testproblem.five_point_structure(csp);
+    TrilinosWrappers::SparseMatrix  A;
+    A.reinit(csp);
     testproblem.five_point(A);
 
     TrilinosWrappers::Vector  f(dim);
index 0d226979b3e31fb0e0745577756ef2319e3e4e64..fc554e920f68f6af52ccef631132e7895e6494a5 100644 (file)
@@ -2,5 +2,5 @@
 DEAL::Size 32 Unknowns 961
 DEAL::Solver type: N6dealii14SolverBicgstabINS_16TrilinosWrappers6VectorEEE
 DEAL:Bicgstab::Starting value 31.0000
-DEAL:Bicgstab::Convergence step 157 value 0.000791865
-DEAL::Solver stopped after 157 iterations
+DEAL:Bicgstab::Convergence step 29 value 0.000873504
+DEAL::Solver stopped after 29 iterations
index 84fc65a4cf2a79abe7953344e79ea763e557d1cb..02eff25ae37da875cd0a7ed345d64d93d209faed 100644 (file)
@@ -81,7 +81,10 @@ int main(int argc, char **argv)
       
                                      // Make matrix
     FDMatrix testproblem(size, size);
-    TrilinosWrappers::SparseMatrix  A(dim, dim, 5U);
+    CompressedSimpleSparsityPattern csp (dim, dim);
+    testproblem.five_point_structure(csp);
+    TrilinosWrappers::SparseMatrix  A;
+    A.reinit(csp);
     testproblem.five_point(A);
 
     TrilinosWrappers::Vector  f(dim);
index 82d911f6b21a015d3c6ed211636ee3ee2741c1d6..8dd71b155b1429dc615c13d375af30838365a096 100644 (file)
@@ -2,5 +2,5 @@
 DEAL::Size 32 Unknowns 961
 DEAL::Solver type: N6dealii11SolverGMRESINS_16TrilinosWrappers6VectorEEE
 DEAL:GMRES::Starting value 31.0000
-DEAL:GMRES::Convergence step 1216 value 0.000999125
-DEAL::Solver stopped after 1216 iterations
+DEAL:GMRES::Convergence step 75 value 0.000809583
+DEAL::Solver stopped after 75 iterations
index 831cde032e04e12be6afd5ee949399f5032e46cb..d3f21390268a0cf0a7704f51fe52b4fd853f8603 100644 (file)
@@ -80,7 +80,10 @@ int main(int argc, char **argv)
       
                                      // Make matrix
     FDMatrix testproblem(size, size);
-    TrilinosWrappers::SparseMatrix  A(dim, dim, 5U);
+    CompressedSimpleSparsityPattern csp (dim, dim);
+    testproblem.five_point_structure(csp);
+    TrilinosWrappers::SparseMatrix  A;
+    A.reinit(csp);
     testproblem.five_point(A);
 
     TrilinosWrappers::Vector  f(dim);
index c5e6785509588761ff041f09c381d19c9d9baa30..f7c2ac8a05df75151a3bcd17e5f9be13ae90a324 100644 (file)
@@ -2,5 +2,5 @@
 DEAL::Size 32 Unknowns 961
 DEAL::Solver type: N6dealii12SolverMinResINS_16TrilinosWrappers6VectorEEE
 DEAL:minres::Starting value 31.0000
-DEAL:minres::Convergence step 33 value 0.000792239
-DEAL::Solver stopped after 33 iterations
+DEAL:minres::Convergence step 5 value 0.000393678
+DEAL::Solver stopped after 5 iterations
index 80f3959ba2d97c2235b4f19400b1711380d66426..2abbf88d165ce2a2c94f078509e6a0676beb2eca 100644 (file)
@@ -79,7 +79,10 @@ int main(int argc, char **argv)
       
                                      // Make matrix
     FDMatrix testproblem(size, size);
-    TrilinosWrappers::SparseMatrix  A(dim, dim, 5U);
+    CompressedSimpleSparsityPattern csp (dim, dim);
+    testproblem.five_point_structure(csp);
+    TrilinosWrappers::SparseMatrix  A;
+    A.reinit(csp);
     testproblem.five_point(A);
 
     TrilinosWrappers::Vector  f(dim);
index c82773454ccf48203e7213dd3286097f6b408ce9..426f6ca330a8ae005c85dedf937fdf09c58c8326 100644 (file)
@@ -2,5 +2,5 @@
 DEAL::Size 32 Unknowns 961
 DEAL::Solver type: N6dealii10SolverQMRSINS_16TrilinosWrappers6VectorEEE
 DEAL:QMRS::Starting value 31.0000
-DEAL:QMRS::Convergence step 135 value 0.000563443
-DEAL::Solver stopped after 135 iterations
+DEAL:QMRS::Convergence step 46 value 0.000906349
+DEAL::Solver stopped after 46 iterations
index d23323f851960dd387436e36c288c701d911f377..6ef52509b8488eb6f372bdb82c5a0c3c456c96b6 100644 (file)
@@ -77,7 +77,10 @@ int main(int argc, char **argv)
       
                                      // Make matrix
     FDMatrix testproblem(size, size);
-    TrilinosWrappers::SparseMatrix  A(dim, dim, 5U);
+    CompressedSimpleSparsityPattern csp (dim, dim);
+    testproblem.five_point_structure(csp);
+    TrilinosWrappers::SparseMatrix  A;
+    A.reinit(csp);
     testproblem.five_point(A);
 
     TrilinosWrappers::Vector  f(dim);
index e6bfda174f10a71d03495e516d1ec5cb1017d419..2a09d922b41f6b3f0d1c96a2ce93eb249c59f83d 100644 (file)
@@ -2,6 +2,6 @@
 DEAL::Size 32 Unknowns 961
 DEAL::Solver type: N6dealii16SolverRichardsonINS_16TrilinosWrappers6VectorEEE
 DEAL:Richardson::Starting value 31.0000
-DEAL:Richardson::Failure step 304 value nan
-DEAL::Iterative method reported convergence failure in step 304 with residual nan
-DEAL::Solver stopped after 304 iterations
+DEAL:Richardson::Failure step 374 value nan
+DEAL::Iterative method reported convergence failure in step 374 with residual nan
+DEAL::Solver stopped after 374 iterations
index 85e5cd722d198ed0b08b688e883b8cfd44b8ef12..b5eb259e5e81681e1898fcc84034485b003761e2 100644 (file)
@@ -65,7 +65,7 @@ int main(int argc, char **argv)
 
 
   {  
-    SolverControl control(200, 1.e-3);
+    SolverControl control(2000, 1.e-3);
 
     const unsigned int size = 32;
     unsigned int dim = (size-1)*(size-1);
@@ -74,7 +74,10 @@ int main(int argc, char **argv)
       
                                      // Make matrix
     FDMatrix testproblem(size, size);
-    TrilinosWrappers::SparseMatrix  A(dim, dim, 5U);
+    CompressedSimpleSparsityPattern csp (dim, dim);
+    testproblem.five_point_structure(csp);
+    TrilinosWrappers::SparseMatrix  A;
+    A.reinit(csp);
     testproblem.five_point(A);
 
     TrilinosWrappers::Vector  f(dim);
index cd77870ef42550fab1c93c50cda80814e2d8ee55..73845884ebd044466c196da773ab3fefbdf8a879 100644 (file)
@@ -1,6 +1,5 @@
 
 DEAL::Size 32 Unknowns 961
-DEAL::Solver type: N6dealii13TrilinosWrappers8SolverCGE
-DEAL::Starting value 7.750
-DEAL::Convergence step 41 value 0.0006730
-DEAL::Solver stopped after 41 iterations
+DEAL::Solver type: N6dealii16TrilinosWrappers8SolverCGE
+DEAL::Convergence step 43 value 0.000818932
+DEAL::Solver stopped after 43 iterations
index 01d8d0798587b26cfa126564b9418414a30470d3..ac4a89d36b9c0b426c61641d5efac246a961b930 100644 (file)
@@ -74,7 +74,10 @@ int main(int argc, char **argv)
       
                                      // Make matrix
     FDMatrix testproblem(size, size);
-    TrilinosWrappers::SparseMatrix  A(dim, dim, 5U);
+    CompressedSimpleSparsityPattern csp (dim, dim);
+    testproblem.five_point_structure(csp);
+    TrilinosWrappers::SparseMatrix  A;
+    A.reinit(csp);
     testproblem.five_point(A);
 
     TrilinosWrappers::Vector  f(dim);
index cfceec460fc1184ce92b6a3c8009fbc5f2bb0ac7..6d09354e9043add53a64295397cd609f289df947 100644 (file)
@@ -1,6 +1,5 @@
 
 DEAL::Size 32 Unknowns 961
-DEAL::Solver type: N6dealii13TrilinosWrappers11SolverGMRESE
-DEAL::Starting value 7.750
-DEAL::Convergence step 48 value 0.0009841
-DEAL::Solver stopped after 48 iterations
+DEAL::Solver type: N6dealii16TrilinosWrappers11SolverGMRESE
+DEAL::Convergence step 71 value 0.000916839
+DEAL::Solver stopped after 71 iterations
index 6e4e7b11e42852a4f9576231912ec16d1172074a..29e5436701643e4a1f9812a99c42fb2ca496db0d 100644 (file)
@@ -74,7 +74,10 @@ int main(int argc, char **argv)
       
                                      // Make matrix
     FDMatrix testproblem(size, size);
-    TrilinosWrappers::SparseMatrix  A(dim, dim, 5U);
+    CompressedSimpleSparsityPattern csp (dim, dim);
+    testproblem.five_point_structure(csp);
+    TrilinosWrappers::SparseMatrix  A;
+    A.reinit(csp);
     testproblem.five_point(A);
 
     TrilinosWrappers::Vector  f(dim);
index 7035db31db63d2816bcc3cecdea4a1de4a35a32c..279363edd5f20bdf8f902bbab7c8a88909da471b 100644 (file)
@@ -73,7 +73,10 @@ int main(int argc, char **argv)
       
                                      // Make matrix
     FDMatrix testproblem(size, size);
-    TrilinosWrappers::SparseMatrix  A(dim, dim, 5U);
+    CompressedSimpleSparsityPattern csp (dim, dim);
+    testproblem.five_point_structure(csp);
+    TrilinosWrappers::SparseMatrix  A;
+    A.reinit(csp);
     testproblem.five_point(A);
 
     TrilinosWrappers::Vector  f(dim);
index c3c7e96b2227ce7f3a79bbb9daf689624654f5b8..6b65ee91bb16d4fe83e12f3e4a511b7f5b8feb90 100644 (file)
@@ -1,6 +1,5 @@
 
 DEAL::Size 32 Unknowns 961
-DEAL::Solver type: N6dealii13TrilinosWrappers9SolverCGSE
-DEAL::Starting value 7.750
-DEAL::Convergence step 40 value 0.0007519
-DEAL::Solver stopped after 40 iterations
+DEAL::Solver type: N6dealii16TrilinosWrappers9SolverCGSE
+DEAL::Convergence step 41 value 0.000549329
+DEAL::Solver stopped after 41 iterations
index cf10682d9367de6b52d458ab3e37479535427b86..643bbbe1c73a667d9c416e7774df7ac3a1e80113 100644 (file)
@@ -74,7 +74,10 @@ int main(int argc, char **argv)
       
                                      // Make matrix
     FDMatrix testproblem(size, size);
-    TrilinosWrappers::SparseMatrix  A(dim, dim, 5U);
+    CompressedSimpleSparsityPattern csp (dim, dim);
+    testproblem.five_point_structure(csp);
+    TrilinosWrappers::SparseMatrix  A;
+    A.reinit(csp);
     testproblem.five_point(A);
 
     TrilinosWrappers::Vector  f(dim);

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.