From: heister Date: Mon, 25 Jan 2010 09:33:23 +0000 (+0000) Subject: tests/petsc: more cleanup X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dc43df4415abdf7aada47652f743a841cba1174;p=dealii-svn.git tests/petsc: more cleanup git-svn-id: https://svn.dealii.org/trunk@20440 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/petsc/deal_solver_01.cc b/tests/petsc/deal_solver_01.cc index 6b93160119..350818cddd 100644 --- a/tests/petsc/deal_solver_01.cc +++ b/tests/petsc/deal_solver_01.cc @@ -60,8 +60,8 @@ check_solve( SOLVER& solver, const MATRIX& A, int main(int argc, char **argv) { std::ofstream logfile("deal_solver_01/output"); - logfile.precision(4); deallog.attach(logfile); + deallog << std::setprecision(4); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/petsc/deal_solver_01/cmp/generic b/tests/petsc/deal_solver_01/cmp/generic index 6eacb4aa59..e5e3067846 100644 --- a/tests/petsc/deal_solver_01/cmp/generic +++ b/tests/petsc/deal_solver_01/cmp/generic @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 DEAL::Solver type: N6dealii8SolverCGINS_13PETScWrappers6VectorEEE -DEAL:cg::Starting value 31.0000 -DEAL:cg::Convergence step 43 value 0.000818932 +DEAL:cg::Starting value 31.00 +DEAL:cg::Convergence step 43 value 0.0008189 DEAL::Solver stopped after 43 iterations diff --git a/tests/petsc/deal_solver_02.cc b/tests/petsc/deal_solver_02.cc index 52d42a5120..55959c412b 100644 --- a/tests/petsc/deal_solver_02.cc +++ b/tests/petsc/deal_solver_02.cc @@ -62,8 +62,8 @@ check_solve( SOLVER& solver, const MATRIX& A, int main(int argc, char **argv) { std::ofstream logfile("deal_solver_02/output"); - logfile.precision(4); deallog.attach(logfile); + deallog << std::setprecision(4); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/petsc/deal_solver_02/cmp/generic b/tests/petsc/deal_solver_02/cmp/generic index 26caa7600b..4cbd6cc5d7 100644 --- a/tests/petsc/deal_solver_02/cmp/generic +++ b/tests/petsc/deal_solver_02/cmp/generic @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 DEAL::Solver type: N6dealii14SolverBicgstabINS_13PETScWrappers6VectorEEE -DEAL:Bicgstab::Starting value 31.0000 -DEAL:Bicgstab::Convergence step 29 value 0.000873501 +DEAL:Bicgstab::Starting value 31.00 +DEAL:Bicgstab::Convergence step 29 value 0.0008735 DEAL::Solver stopped after 29 iterations diff --git a/tests/petsc/solver_01.cc b/tests/petsc/solver_01.cc index c3f763204f..4607a57cbb 100644 --- a/tests/petsc/solver_01.cc +++ b/tests/petsc/solver_01.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -57,8 +57,8 @@ check_solve( SOLVER& solver, const MATRIX& A, int main(int argc, char **argv) { std::ofstream logfile("solver_01/output"); - logfile.precision(4); deallog.attach(logfile); + deallog << std::setprecision(4); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/petsc/solver_01/cmp/x86_64-unknown-linux-gnu+gcc4.3 b/tests/petsc/solver_01/cmp/x86_64-unknown-linux-gnu+gcc4.3 deleted file mode 100644 index f5f69d525e..0000000000 --- a/tests/petsc/solver_01/cmp/x86_64-unknown-linux-gnu+gcc4.3 +++ /dev/null @@ -1,7 +0,0 @@ - -DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers16SolverRichardsonE -DEAL::Starting value 7.75000 -DEAL::Failure step 100 value 4.00437 -DEAL::Iterative method reported convergence failure in step 100 with residual 4.00437 -DEAL::Solver stopped after 100 iterations diff --git a/tests/petsc/solver_02.cc b/tests/petsc/solver_02.cc index 3bf12f60f1..131da7150f 100644 --- a/tests/petsc/solver_02.cc +++ b/tests/petsc/solver_02.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -56,8 +56,8 @@ check_solve( SOLVER& solver, const MATRIX& A, int main(int argc, char **argv) { std::ofstream logfile("solver_02/output"); - logfile.precision(4); deallog.attach(logfile); + deallog << std::setprecision(4); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/petsc/solver_02/cmp/x86_64-unknown-linux-gnu+gcc4.3 b/tests/petsc/solver_02/cmp/x86_64-unknown-linux-gnu+gcc4.3 deleted file mode 100644 index bd770388f0..0000000000 --- a/tests/petsc/solver_02/cmp/x86_64-unknown-linux-gnu+gcc4.3 +++ /dev/null @@ -1,7 +0,0 @@ - -DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers15SolverChebychevE -DEAL::Starting value 7.74501 -DEAL::Failure step 100 value 3.88526 -DEAL::Iterative method reported convergence failure in step 100 with residual 3.88526 -DEAL::Solver stopped after 100 iterations diff --git a/tests/petsc/solver_03.cc b/tests/petsc/solver_03.cc index 95d5f57977..fc7d6ebee5 100644 --- a/tests/petsc/solver_03.cc +++ b/tests/petsc/solver_03.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -55,8 +55,8 @@ check_solve( SOLVER& solver, const MATRIX& A, int main(int argc, char **argv) { std::ofstream logfile("solver_03/output"); - logfile.precision(4); deallog.attach(logfile); + deallog << std::setprecision(4); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/petsc/solver_03/cmp/x86_64-unknown-linux-gnu+gcc4.3 b/tests/petsc/solver_03/cmp/x86_64-unknown-linux-gnu+gcc4.3 deleted file mode 100644 index cbb7e73356..0000000000 --- a/tests/petsc/solver_03/cmp/x86_64-unknown-linux-gnu+gcc4.3 +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers8SolverCGE -DEAL::Starting value 7.75000 -DEAL::Convergence step 41 value 0.000672952 -DEAL::Solver stopped after 41 iterations diff --git a/tests/petsc/solver_04.cc b/tests/petsc/solver_04.cc index 36c63d2e3a..7ac66b800f 100644 --- a/tests/petsc/solver_04.cc +++ b/tests/petsc/solver_04.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -55,8 +55,8 @@ check_solve( SOLVER& solver, const MATRIX& A, int main(int argc, char **argv) { std::ofstream logfile("solver_04/output"); - logfile.precision(4); deallog.attach(logfile); + deallog << std::setprecision(4); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/petsc/solver_04/cmp/x86_64-unknown-linux-gnu+gcc4.3 b/tests/petsc/solver_04/cmp/x86_64-unknown-linux-gnu+gcc4.3 deleted file mode 100644 index a63b8c0674..0000000000 --- a/tests/petsc/solver_04/cmp/x86_64-unknown-linux-gnu+gcc4.3 +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers10SolverBiCGE -DEAL::Starting value 7.75000 -DEAL::Convergence step 41 value 0.000672952 -DEAL::Solver stopped after 41 iterations diff --git a/tests/petsc/solver_05.cc b/tests/petsc/solver_05.cc index 81bab513b5..c767e2b906 100644 --- a/tests/petsc/solver_05.cc +++ b/tests/petsc/solver_05.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -55,8 +55,8 @@ check_solve( SOLVER& solver, const MATRIX& A, int main(int argc, char **argv) { std::ofstream logfile("solver_05/output"); - logfile.precision(4); deallog.attach(logfile); + deallog << std::setprecision(4); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/petsc/solver_05/cmp/x86_64-unknown-linux-gnu+gcc4.3 b/tests/petsc/solver_05/cmp/x86_64-unknown-linux-gnu+gcc4.3 deleted file mode 100644 index a0c83770de..0000000000 --- a/tests/petsc/solver_05/cmp/x86_64-unknown-linux-gnu+gcc4.3 +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers11SolverGMRESE -DEAL::Starting value 7.75000 -DEAL::Convergence step 48 value 0.000984105 -DEAL::Solver stopped after 48 iterations diff --git a/tests/petsc/solver_06.cc b/tests/petsc/solver_06.cc index 05ebfea704..357eb5a63d 100644 --- a/tests/petsc/solver_06.cc +++ b/tests/petsc/solver_06.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -55,8 +55,8 @@ check_solve( SOLVER& solver, const MATRIX& A, int main(int argc, char **argv) { std::ofstream logfile("solver_06/output"); - logfile.precision(4); deallog.attach(logfile); + deallog << std::setprecision(4); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/petsc/solver_06/cmp/x86_64-unknown-linux-gnu+gcc4.3 b/tests/petsc/solver_06/cmp/x86_64-unknown-linux-gnu+gcc4.3 deleted file mode 100644 index 44201cbee2..0000000000 --- a/tests/petsc/solver_06/cmp/x86_64-unknown-linux-gnu+gcc4.3 +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers14SolverBicgstabE -DEAL::Starting value 7.75000 -DEAL::Convergence step 33 value 0.000574488 -DEAL::Solver stopped after 33 iterations diff --git a/tests/petsc/solver_07.cc b/tests/petsc/solver_07.cc index b1326285c6..a009a50725 100644 --- a/tests/petsc/solver_07.cc +++ b/tests/petsc/solver_07.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -55,8 +55,8 @@ check_solve( SOLVER& solver, const MATRIX& A, int main(int argc, char **argv) { std::ofstream logfile("solver_07/output"); - logfile.precision(4); deallog.attach(logfile); + deallog << std::setprecision(4); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/petsc/solver_07/cmp/x86_64-unknown-linux-gnu+gcc4.3 b/tests/petsc/solver_07/cmp/x86_64-unknown-linux-gnu+gcc4.3 deleted file mode 100644 index a97325421a..0000000000 --- a/tests/petsc/solver_07/cmp/x86_64-unknown-linux-gnu+gcc4.3 +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers9SolverCGSE -DEAL::Starting value 7.75000 -DEAL::Convergence step 40 value 0.000751860 -DEAL::Solver stopped after 40 iterations diff --git a/tests/petsc/solver_08.cc b/tests/petsc/solver_08.cc index 928df89e0d..68c84b03e2 100644 --- a/tests/petsc/solver_08.cc +++ b/tests/petsc/solver_08.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -55,8 +55,8 @@ check_solve( SOLVER& solver, const MATRIX& A, int main(int argc, char **argv) { std::ofstream logfile("solver_08/output"); - logfile.precision(4); deallog.attach(logfile); + deallog << std::setprecision(4); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/petsc/solver_08/cmp/x86_64-unknown-linux-gnu+gcc4.3 b/tests/petsc/solver_08/cmp/x86_64-unknown-linux-gnu+gcc4.3 deleted file mode 100644 index 2f1ce6e4a1..0000000000 --- a/tests/petsc/solver_08/cmp/x86_64-unknown-linux-gnu+gcc4.3 +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers11SolverTFQMRE -DEAL::Starting value 7.75000 -DEAL::Convergence step 40 value 0.000867994 -DEAL::Solver stopped after 40 iterations diff --git a/tests/petsc/solver_09.cc b/tests/petsc/solver_09.cc index b920798e00..e547c76bc6 100644 --- a/tests/petsc/solver_09.cc +++ b/tests/petsc/solver_09.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -59,8 +59,8 @@ check_solve( SOLVER& solver, const MATRIX& A, int main(int argc, char **argv) { std::ofstream logfile("solver_09/output"); - logfile.precision(4); deallog.attach(logfile); + deallog << std::setprecision(4); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/petsc/solver_09/cmp/x86_64-unknown-linux-gnu+gcc4.2 b/tests/petsc/solver_09/cmp/x86_64-unknown-linux-gnu+gcc4.2 new file mode 100644 index 0000000000..34a22672b0 --- /dev/null +++ b/tests/petsc/solver_09/cmp/x86_64-unknown-linux-gnu+gcc4.2 @@ -0,0 +1,7 @@ + +DEAL::Size 32 Unknowns 961 +DEAL::Solver type: N6dealii13PETScWrappers11SolverTCQMRE +DEAL::Starting value 7.750 +DEAL::Starting value 7.750 +DEAL::Convergence step 44 value 0.0007008 +DEAL::Solver stopped after 44 iterations diff --git a/tests/petsc/solver_09/cmp/x86_64-unknown-linux-gnu+gcc4.3 b/tests/petsc/solver_09/cmp/x86_64-unknown-linux-gnu+gcc4.3 index 1c6b7a12b3..34a22672b0 100644 --- a/tests/petsc/solver_09/cmp/x86_64-unknown-linux-gnu+gcc4.3 +++ b/tests/petsc/solver_09/cmp/x86_64-unknown-linux-gnu+gcc4.3 @@ -1,7 +1,7 @@ DEAL::Size 32 Unknowns 961 DEAL::Solver type: N6dealii13PETScWrappers11SolverTCQMRE -DEAL::Starting value 7.75000 -DEAL::Starting value 7.75000 -DEAL::Convergence step 44 value 0.000700842 +DEAL::Starting value 7.750 +DEAL::Starting value 7.750 +DEAL::Convergence step 44 value 0.0007008 DEAL::Solver stopped after 44 iterations diff --git a/tests/petsc/solver_10.cc b/tests/petsc/solver_10.cc index c8a63ae646..26e283826a 100644 --- a/tests/petsc/solver_10.cc +++ b/tests/petsc/solver_10.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -55,8 +55,8 @@ check_solve( SOLVER& solver, const MATRIX& A, int main(int argc, char **argv) { std::ofstream logfile("solver_10/output"); - logfile.precision(4); deallog.attach(logfile); + deallog << std::setprecision(4); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/petsc/solver_10/cmp/x86_64-unknown-linux-gnu+gcc4.3 b/tests/petsc/solver_10/cmp/x86_64-unknown-linux-gnu+gcc4.3 deleted file mode 100644 index 4706970d2f..0000000000 --- a/tests/petsc/solver_10/cmp/x86_64-unknown-linux-gnu+gcc4.3 +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii13PETScWrappers8SolverCRE -DEAL::Starting value 7.75000 -DEAL::Convergence step 41 value 0.000570004 -DEAL::Solver stopped after 41 iterations diff --git a/tests/petsc/solver_11.cc b/tests/petsc/solver_11.cc index a807d30808..8ecee4483f 100644 --- a/tests/petsc/solver_11.cc +++ b/tests/petsc/solver_11.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -56,8 +56,8 @@ check_solve( SOLVER& solver, const MATRIX& A, int main(int argc, char **argv) { std::ofstream logfile("solver_11/output"); - logfile.precision(4); deallog.attach(logfile); + deallog << std::setprecision(4); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/petsc/solver_11/cmp/x86_64-unknown-linux-gnu+gcc4.2 b/tests/petsc/solver_11/cmp/x86_64-unknown-linux-gnu+gcc4.2 new file mode 100644 index 0000000000..3b0d9868be --- /dev/null +++ b/tests/petsc/solver_11/cmp/x86_64-unknown-linux-gnu+gcc4.2 @@ -0,0 +1,7 @@ + +DEAL::Size 32 Unknowns 961 +DEAL::Solver type: N6dealii13PETScWrappers10SolverLSQRE +DEAL::Starting value 31.00 +DEAL::Failure step 100 value 24.02 +DEAL::Iterative method reported convergence failure in step 100 with residual 24.0219 +DEAL::Solver stopped after 100 iterations