From 043739c18bce69a6ff9975b168d2045d6ef06495 Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 7 Nov 2008 16:42:44 +0000 Subject: [PATCH] Update a few test results. git-svn-id: https://svn.dealii.org/trunk@17515 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/trilinos/deal_solver_01/cmp/generic | 2 +- .../deal_solver_01/cmp/x86_64-unknown-linux-gnu+gcc4.2 | 6 ++++++ tests/trilinos/deal_solver_02/cmp/generic | 2 +- .../deal_solver_02/cmp/x86_64-unknown-linux-gnu+gcc4.2 | 6 ++++++ tests/trilinos/deal_solver_03/cmp/generic | 2 +- .../deal_solver_03/cmp/x86_64-unknown-linux-gnu+gcc4.2 | 6 ++++++ tests/trilinos/deal_solver_04/cmp/generic | 2 +- .../deal_solver_04/cmp/x86_64-unknown-linux-gnu+gcc4.2 | 6 ++++++ tests/trilinos/deal_solver_05/cmp/generic | 2 +- .../deal_solver_05/cmp/x86_64-unknown-linux-gnu+gcc4.2 | 6 ++++++ tests/trilinos/deal_solver_06/cmp/generic | 2 +- .../deal_solver_06/cmp/i386-apple-darwin8.10.1+gcc4.0 | 2 +- .../deal_solver_06/cmp/x86_64-unknown-linux-gnu+gcc4.2 | 7 +++++++ tests/trilinos/parallel_sparse_matrix_01.cc | 2 +- tests/trilinos/solver_03/cmp/generic | 2 +- tests/trilinos/solver_05/cmp/generic | 2 +- tests/trilinos/solver_06/cmp/generic | 2 +- .../trilinos/solver_06/cmp/i386-apple-darwin8.10.1+gcc4.0 | 2 +- .../solver_06/cmp/powerpc-apple-darwin8.10.0+gcc4.0 | 2 +- .../trilinos/solver_06/cmp/x86_64-unknown-linux-gnu+gcc3.3 | 2 +- tests/trilinos/solver_07/cmp/generic | 2 +- tests/trilinos/solver_08/cmp/generic | 2 +- 22 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 tests/trilinos/deal_solver_01/cmp/x86_64-unknown-linux-gnu+gcc4.2 create mode 100644 tests/trilinos/deal_solver_02/cmp/x86_64-unknown-linux-gnu+gcc4.2 create mode 100644 tests/trilinos/deal_solver_03/cmp/x86_64-unknown-linux-gnu+gcc4.2 create mode 100644 tests/trilinos/deal_solver_04/cmp/x86_64-unknown-linux-gnu+gcc4.2 create mode 100644 tests/trilinos/deal_solver_05/cmp/x86_64-unknown-linux-gnu+gcc4.2 create mode 100644 tests/trilinos/deal_solver_06/cmp/x86_64-unknown-linux-gnu+gcc4.2 diff --git a/tests/trilinos/deal_solver_01/cmp/generic b/tests/trilinos/deal_solver_01/cmp/generic index 72d2bc0d11..2966c19797 100644 --- a/tests/trilinos/deal_solver_01/cmp/generic +++ b/tests/trilinos/deal_solver_01/cmp/generic @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii8SolverCGINS_13PETScWrappers6VectorEEE +DEAL::Solver type: N6dealii8SolverCGINS_13TrilinosWrappers6VectorEEE DEAL:cg::Starting value 31.00 DEAL:cg::Convergence step 43 value 0.0008189 DEAL::Solver stopped after 43 iterations diff --git a/tests/trilinos/deal_solver_01/cmp/x86_64-unknown-linux-gnu+gcc4.2 b/tests/trilinos/deal_solver_01/cmp/x86_64-unknown-linux-gnu+gcc4.2 new file mode 100644 index 0000000000..3c41788e2b --- /dev/null +++ b/tests/trilinos/deal_solver_01/cmp/x86_64-unknown-linux-gnu+gcc4.2 @@ -0,0 +1,6 @@ + +DEAL::Size 32 Unknowns 961 +DEAL::Solver type: N6dealii8SolverCGINS_16TrilinosWrappers6VectorEEE +DEAL:cg::Starting value 31.0000 +DEAL:cg::Convergence step 128 value 0.000815153 +DEAL::Solver stopped after 128 iterations diff --git a/tests/trilinos/deal_solver_02/cmp/generic b/tests/trilinos/deal_solver_02/cmp/generic index 6a6c9d882e..3a7f77b3df 100644 --- a/tests/trilinos/deal_solver_02/cmp/generic +++ b/tests/trilinos/deal_solver_02/cmp/generic @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii14SolverBicgstabINS_13PETScWrappers6VectorEEE +DEAL::Solver type: N6dealii14SolverBicgstabINS_13TrilinosWrappers6VectorEEE DEAL:Bicgstab::Starting value 31.00 DEAL:Bicgstab::Convergence step 29 value 0.0008735 DEAL::Solver stopped after 29 iterations diff --git a/tests/trilinos/deal_solver_02/cmp/x86_64-unknown-linux-gnu+gcc4.2 b/tests/trilinos/deal_solver_02/cmp/x86_64-unknown-linux-gnu+gcc4.2 new file mode 100644 index 0000000000..725b661ee3 --- /dev/null +++ b/tests/trilinos/deal_solver_02/cmp/x86_64-unknown-linux-gnu+gcc4.2 @@ -0,0 +1,6 @@ + +DEAL::Size 32 Unknowns 961 +DEAL::Solver type: N6dealii14SolverBicgstabINS_16TrilinosWrappers6VectorEEE +DEAL:Bicgstab::Starting value 31.0000 +DEAL:Bicgstab::Convergence step 171 value 0.000968854 +DEAL::Solver stopped after 171 iterations diff --git a/tests/trilinos/deal_solver_03/cmp/generic b/tests/trilinos/deal_solver_03/cmp/generic index d5452305fa..1f7eeb4f0e 100644 --- a/tests/trilinos/deal_solver_03/cmp/generic +++ b/tests/trilinos/deal_solver_03/cmp/generic @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii11SolverGMRESINS_13PETScWrappers6VectorEEE +DEAL::Solver type: N6dealii11SolverGMRESINS_13TrilinosWrappers6VectorEEE DEAL:GMRES::Starting value 31.00 DEAL:GMRES::Convergence step 75 value 0.0008096 DEAL::Solver stopped after 75 iterations diff --git a/tests/trilinos/deal_solver_03/cmp/x86_64-unknown-linux-gnu+gcc4.2 b/tests/trilinos/deal_solver_03/cmp/x86_64-unknown-linux-gnu+gcc4.2 new file mode 100644 index 0000000000..067609c878 --- /dev/null +++ b/tests/trilinos/deal_solver_03/cmp/x86_64-unknown-linux-gnu+gcc4.2 @@ -0,0 +1,6 @@ + +DEAL::Size 32 Unknowns 961 +DEAL::Solver type: N6dealii11SolverGMRESINS_16TrilinosWrappers6VectorEEE +DEAL:GMRES::Starting value 31.0000 +DEAL:GMRES::Convergence step 1219 value 0.000994115 +DEAL::Solver stopped after 1219 iterations diff --git a/tests/trilinos/deal_solver_04/cmp/generic b/tests/trilinos/deal_solver_04/cmp/generic index e323192fbb..8540041c58 100644 --- a/tests/trilinos/deal_solver_04/cmp/generic +++ b/tests/trilinos/deal_solver_04/cmp/generic @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii12SolverMinResINS_13PETScWrappers6VectorEEE +DEAL::Solver type: N6dealii12SolverMinResINS_13TrilinosWrappers6VectorEEE DEAL:minres::Starting value 31.00 DEAL:minres::Convergence step 43 value 0.0006916 DEAL::Solver stopped after 43 iterations diff --git a/tests/trilinos/deal_solver_04/cmp/x86_64-unknown-linux-gnu+gcc4.2 b/tests/trilinos/deal_solver_04/cmp/x86_64-unknown-linux-gnu+gcc4.2 new file mode 100644 index 0000000000..bd46a20ecd --- /dev/null +++ b/tests/trilinos/deal_solver_04/cmp/x86_64-unknown-linux-gnu+gcc4.2 @@ -0,0 +1,6 @@ + +DEAL::Size 32 Unknowns 961 +DEAL::Solver type: N6dealii12SolverMinResINS_16TrilinosWrappers6VectorEEE +DEAL:minres::Starting value 31.0000 +DEAL:minres::Convergence step 33 value 0.000792244 +DEAL::Solver stopped after 33 iterations diff --git a/tests/trilinos/deal_solver_05/cmp/generic b/tests/trilinos/deal_solver_05/cmp/generic index d864cd6c23..adc09bb354 100644 --- a/tests/trilinos/deal_solver_05/cmp/generic +++ b/tests/trilinos/deal_solver_05/cmp/generic @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii10SolverQMRSINS_13PETScWrappers6VectorEEE +DEAL::Solver type: N6dealii10SolverQMRSINS_13TrilinosWrappers6VectorEEE DEAL:QMRS::Starting value 31.00 DEAL:QMRS::Convergence step 46 value 0.0009063 DEAL::Solver stopped after 46 iterations diff --git a/tests/trilinos/deal_solver_05/cmp/x86_64-unknown-linux-gnu+gcc4.2 b/tests/trilinos/deal_solver_05/cmp/x86_64-unknown-linux-gnu+gcc4.2 new file mode 100644 index 0000000000..a975e7ce4f --- /dev/null +++ b/tests/trilinos/deal_solver_05/cmp/x86_64-unknown-linux-gnu+gcc4.2 @@ -0,0 +1,6 @@ + +DEAL::Size 32 Unknowns 961 +DEAL::Solver type: N6dealii10SolverQMRSINS_16TrilinosWrappers6VectorEEE +DEAL:QMRS::Starting value 31.0000 +DEAL:QMRS::Convergence step 135 value 0.000576843 +DEAL::Solver stopped after 135 iterations diff --git a/tests/trilinos/deal_solver_06/cmp/generic b/tests/trilinos/deal_solver_06/cmp/generic index 487ad5bc2c..604b303698 100644 --- a/tests/trilinos/deal_solver_06/cmp/generic +++ b/tests/trilinos/deal_solver_06/cmp/generic @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii16SolverRichardsonINS_13PETScWrappers6VectorEEE +DEAL::Solver type: N6dealii16SolverRichardsonINS_13TrilinosWrappers6VectorEEE DEAL:Richardson::Starting value 31.00 DEAL:Richardson::Failure step 372 value nan DEAL::Iterative method reported convergence failure in step 372 with residual nan diff --git a/tests/trilinos/deal_solver_06/cmp/i386-apple-darwin8.10.1+gcc4.0 b/tests/trilinos/deal_solver_06/cmp/i386-apple-darwin8.10.1+gcc4.0 index de4c75be9b..27bffdf226 100644 --- a/tests/trilinos/deal_solver_06/cmp/i386-apple-darwin8.10.1+gcc4.0 +++ b/tests/trilinos/deal_solver_06/cmp/i386-apple-darwin8.10.1+gcc4.0 @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii16SolverRichardsonINS_13PETScWrappers6VectorEEE +DEAL::Solver type: N6dealii16SolverRichardsonINS_13TrilinosWrappers6VectorEEE DEAL:Richardson::Starting value 31.00 DEAL:Richardson::Failure step 10000 value nan DEAL::Iterative method reported convergence failure in step 10000 with residual nan diff --git a/tests/trilinos/deal_solver_06/cmp/x86_64-unknown-linux-gnu+gcc4.2 b/tests/trilinos/deal_solver_06/cmp/x86_64-unknown-linux-gnu+gcc4.2 new file mode 100644 index 0000000000..e6bfda174f --- /dev/null +++ b/tests/trilinos/deal_solver_06/cmp/x86_64-unknown-linux-gnu+gcc4.2 @@ -0,0 +1,7 @@ + +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 diff --git a/tests/trilinos/parallel_sparse_matrix_01.cc b/tests/trilinos/parallel_sparse_matrix_01.cc index 60919c0e62..d7bd9c8f68 100644 --- a/tests/trilinos/parallel_sparse_matrix_01.cc +++ b/tests/trilinos/parallel_sparse_matrix_01.cc @@ -101,7 +101,7 @@ void test () int main (int argc,char **argv) { - std::ofstream logfile("sparse_matrix_01/output"); + std::ofstream logfile("parallel_sparse_matrix_01/output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/trilinos/solver_03/cmp/generic b/tests/trilinos/solver_03/cmp/generic index 2237281800..cd77870ef4 100644 --- a/tests/trilinos/solver_03/cmp/generic +++ b/tests/trilinos/solver_03/cmp/generic @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers8SolverCGE +DEAL::Solver type: N6dealii13TrilinosWrappers8SolverCGE DEAL::Starting value 7.750 DEAL::Convergence step 41 value 0.0006730 DEAL::Solver stopped after 41 iterations diff --git a/tests/trilinos/solver_05/cmp/generic b/tests/trilinos/solver_05/cmp/generic index d06c236119..cfceec460f 100644 --- a/tests/trilinos/solver_05/cmp/generic +++ b/tests/trilinos/solver_05/cmp/generic @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers11SolverGMRESE +DEAL::Solver type: N6dealii13TrilinosWrappers11SolverGMRESE DEAL::Starting value 7.750 DEAL::Convergence step 48 value 0.0009841 DEAL::Solver stopped after 48 iterations diff --git a/tests/trilinos/solver_06/cmp/generic b/tests/trilinos/solver_06/cmp/generic index 073a21521e..fadfbe5752 100644 --- a/tests/trilinos/solver_06/cmp/generic +++ b/tests/trilinos/solver_06/cmp/generic @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers14SolverBicgstabE +DEAL::Solver type: N6dealii13TrilinosWrappers14SolverBicgstabE DEAL::Starting value 7.750 DEAL::Convergence step 33 value 0.0005745 DEAL::Solver stopped after 33 iterations diff --git a/tests/trilinos/solver_06/cmp/i386-apple-darwin8.10.1+gcc4.0 b/tests/trilinos/solver_06/cmp/i386-apple-darwin8.10.1+gcc4.0 index 3251a82276..644832843d 100644 --- a/tests/trilinos/solver_06/cmp/i386-apple-darwin8.10.1+gcc4.0 +++ b/tests/trilinos/solver_06/cmp/i386-apple-darwin8.10.1+gcc4.0 @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers14SolverBicgstabE +DEAL::Solver type: N6dealii13TrilinosWrappers14SolverBicgstabE DEAL::Starting value 7.750 DEAL::Convergence step 33 value 0.0005777 DEAL::Solver stopped after 33 iterations diff --git a/tests/trilinos/solver_06/cmp/powerpc-apple-darwin8.10.0+gcc4.0 b/tests/trilinos/solver_06/cmp/powerpc-apple-darwin8.10.0+gcc4.0 index fc4eb83b57..d06770b469 100644 --- a/tests/trilinos/solver_06/cmp/powerpc-apple-darwin8.10.0+gcc4.0 +++ b/tests/trilinos/solver_06/cmp/powerpc-apple-darwin8.10.0+gcc4.0 @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers14SolverBicgstabE +DEAL::Solver type: N6dealii13TrilinosWrappers14SolverBicgstabE DEAL::Starting value 7.750 DEAL::Convergence step 33 value 0.0005766 DEAL::Solver stopped after 33 iterations diff --git a/tests/trilinos/solver_06/cmp/x86_64-unknown-linux-gnu+gcc3.3 b/tests/trilinos/solver_06/cmp/x86_64-unknown-linux-gnu+gcc3.3 index 3251a82276..644832843d 100644 --- a/tests/trilinos/solver_06/cmp/x86_64-unknown-linux-gnu+gcc3.3 +++ b/tests/trilinos/solver_06/cmp/x86_64-unknown-linux-gnu+gcc3.3 @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers14SolverBicgstabE +DEAL::Solver type: N6dealii13TrilinosWrappers14SolverBicgstabE DEAL::Starting value 7.750 DEAL::Convergence step 33 value 0.0005777 DEAL::Solver stopped after 33 iterations diff --git a/tests/trilinos/solver_07/cmp/generic b/tests/trilinos/solver_07/cmp/generic index f4c27026d0..c3c7e96b22 100644 --- a/tests/trilinos/solver_07/cmp/generic +++ b/tests/trilinos/solver_07/cmp/generic @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers9SolverCGSE +DEAL::Solver type: N6dealii13TrilinosWrappers9SolverCGSE DEAL::Starting value 7.750 DEAL::Convergence step 40 value 0.0007519 DEAL::Solver stopped after 40 iterations diff --git a/tests/trilinos/solver_08/cmp/generic b/tests/trilinos/solver_08/cmp/generic index 7f1d94f542..5fb0124e55 100644 --- a/tests/trilinos/solver_08/cmp/generic +++ b/tests/trilinos/solver_08/cmp/generic @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers11SolverTFQMRE +DEAL::Solver type: N6dealii13TrilinosWrappers11SolverTFQMRE DEAL::Starting value 7.750 DEAL::Convergence step 40 value 0.0008680 DEAL::Solver stopped after 40 iterations -- 2.39.5