From: kronbichler Date: Mon, 23 Nov 2009 05:36:02 +0000 (+0000) Subject: Fix some more Trilinos tests. Currently, the Bicgstab and the TFQMR solver fail,... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8ba5cf1a60c1c5e08561e70dd433014e0acfe27;p=dealii-svn.git Fix some more Trilinos tests. Currently, the Bicgstab and the TFQMR solver fail, but that seems to be Trilinos' fault. git-svn-id: https://svn.dealii.org/trunk@20152 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/trilinos/deal_solver_01.cc b/tests/trilinos/deal_solver_01.cc index 4aff093bb3..f380c4508d 100644 --- a/tests/trilinos/deal_solver_01.cc +++ b/tests/trilinos/deal_solver_01.cc @@ -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); diff --git a/tests/trilinos/deal_solver_01/cmp/generic b/tests/trilinos/deal_solver_01/cmp/generic index 1de0dcccf5..2e7eaf8b3b 100644 --- a/tests/trilinos/deal_solver_01/cmp/generic +++ b/tests/trilinos/deal_solver_01/cmp/generic @@ -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 diff --git a/tests/trilinos/deal_solver_02.cc b/tests/trilinos/deal_solver_02.cc index ed15c6c55b..a1b972a671 100644 --- a/tests/trilinos/deal_solver_02.cc +++ b/tests/trilinos/deal_solver_02.cc @@ -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); diff --git a/tests/trilinos/deal_solver_02/cmp/generic b/tests/trilinos/deal_solver_02/cmp/generic index 0d226979b3..fc554e920f 100644 --- a/tests/trilinos/deal_solver_02/cmp/generic +++ b/tests/trilinos/deal_solver_02/cmp/generic @@ -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 diff --git a/tests/trilinos/deal_solver_03.cc b/tests/trilinos/deal_solver_03.cc index 84fc65a4cf..02eff25ae3 100644 --- a/tests/trilinos/deal_solver_03.cc +++ b/tests/trilinos/deal_solver_03.cc @@ -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); diff --git a/tests/trilinos/deal_solver_03/cmp/generic b/tests/trilinos/deal_solver_03/cmp/generic index 82d911f6b2..8dd71b155b 100644 --- a/tests/trilinos/deal_solver_03/cmp/generic +++ b/tests/trilinos/deal_solver_03/cmp/generic @@ -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 diff --git a/tests/trilinos/deal_solver_04.cc b/tests/trilinos/deal_solver_04.cc index 831cde032e..d3f2139026 100644 --- a/tests/trilinos/deal_solver_04.cc +++ b/tests/trilinos/deal_solver_04.cc @@ -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); diff --git a/tests/trilinos/deal_solver_04/cmp/generic b/tests/trilinos/deal_solver_04/cmp/generic index c5e6785509..f7c2ac8a05 100644 --- a/tests/trilinos/deal_solver_04/cmp/generic +++ b/tests/trilinos/deal_solver_04/cmp/generic @@ -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 diff --git a/tests/trilinos/deal_solver_05.cc b/tests/trilinos/deal_solver_05.cc index 80f3959ba2..2abbf88d16 100644 --- a/tests/trilinos/deal_solver_05.cc +++ b/tests/trilinos/deal_solver_05.cc @@ -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); diff --git a/tests/trilinos/deal_solver_05/cmp/generic b/tests/trilinos/deal_solver_05/cmp/generic index c82773454c..426f6ca330 100644 --- a/tests/trilinos/deal_solver_05/cmp/generic +++ b/tests/trilinos/deal_solver_05/cmp/generic @@ -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 diff --git a/tests/trilinos/deal_solver_06.cc b/tests/trilinos/deal_solver_06.cc index d23323f851..6ef52509b8 100644 --- a/tests/trilinos/deal_solver_06.cc +++ b/tests/trilinos/deal_solver_06.cc @@ -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); diff --git a/tests/trilinos/deal_solver_06/cmp/generic b/tests/trilinos/deal_solver_06/cmp/generic index e6bfda174f..2a09d922b4 100644 --- a/tests/trilinos/deal_solver_06/cmp/generic +++ b/tests/trilinos/deal_solver_06/cmp/generic @@ -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 diff --git a/tests/trilinos/solver_03.cc b/tests/trilinos/solver_03.cc index 85e5cd722d..b5eb259e5e 100644 --- a/tests/trilinos/solver_03.cc +++ b/tests/trilinos/solver_03.cc @@ -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); diff --git a/tests/trilinos/solver_03/cmp/generic b/tests/trilinos/solver_03/cmp/generic index cd77870ef4..73845884eb 100644 --- a/tests/trilinos/solver_03/cmp/generic +++ b/tests/trilinos/solver_03/cmp/generic @@ -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 diff --git a/tests/trilinos/solver_05.cc b/tests/trilinos/solver_05.cc index 01d8d07985..ac4a89d36b 100644 --- a/tests/trilinos/solver_05.cc +++ b/tests/trilinos/solver_05.cc @@ -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); diff --git a/tests/trilinos/solver_05/cmp/generic b/tests/trilinos/solver_05/cmp/generic index cfceec460f..6d09354e90 100644 --- a/tests/trilinos/solver_05/cmp/generic +++ b/tests/trilinos/solver_05/cmp/generic @@ -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 diff --git a/tests/trilinos/solver_06.cc b/tests/trilinos/solver_06.cc index 6e4e7b11e4..29e5436701 100644 --- a/tests/trilinos/solver_06.cc +++ b/tests/trilinos/solver_06.cc @@ -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); diff --git a/tests/trilinos/solver_07.cc b/tests/trilinos/solver_07.cc index 7035db31db..279363edd5 100644 --- a/tests/trilinos/solver_07.cc +++ b/tests/trilinos/solver_07.cc @@ -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); diff --git a/tests/trilinos/solver_07/cmp/generic b/tests/trilinos/solver_07/cmp/generic index c3c7e96b22..6b65ee91bb 100644 --- a/tests/trilinos/solver_07/cmp/generic +++ b/tests/trilinos/solver_07/cmp/generic @@ -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 diff --git a/tests/trilinos/solver_08.cc b/tests/trilinos/solver_08.cc index cf10682d93..643bbbe1c7 100644 --- a/tests/trilinos/solver_08.cc +++ b/tests/trilinos/solver_08.cc @@ -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);