]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
tests/petsc: more cleanup
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 25 Jan 2010 09:33:23 +0000 (09:33 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 25 Jan 2010 09:33:23 +0000 (09:33 +0000)
git-svn-id: https://svn.dealii.org/trunk@20440 0785d39b-7218-0410-832d-ea1e28bc413d

27 files changed:
tests/petsc/deal_solver_01.cc
tests/petsc/deal_solver_01/cmp/generic
tests/petsc/deal_solver_02.cc
tests/petsc/deal_solver_02/cmp/generic
tests/petsc/solver_01.cc
tests/petsc/solver_01/cmp/x86_64-unknown-linux-gnu+gcc4.3 [deleted file]
tests/petsc/solver_02.cc
tests/petsc/solver_02/cmp/x86_64-unknown-linux-gnu+gcc4.3 [deleted file]
tests/petsc/solver_03.cc
tests/petsc/solver_03/cmp/x86_64-unknown-linux-gnu+gcc4.3 [deleted file]
tests/petsc/solver_04.cc
tests/petsc/solver_04/cmp/x86_64-unknown-linux-gnu+gcc4.3 [deleted file]
tests/petsc/solver_05.cc
tests/petsc/solver_05/cmp/x86_64-unknown-linux-gnu+gcc4.3 [deleted file]
tests/petsc/solver_06.cc
tests/petsc/solver_06/cmp/x86_64-unknown-linux-gnu+gcc4.3 [deleted file]
tests/petsc/solver_07.cc
tests/petsc/solver_07/cmp/x86_64-unknown-linux-gnu+gcc4.3 [deleted file]
tests/petsc/solver_08.cc
tests/petsc/solver_08/cmp/x86_64-unknown-linux-gnu+gcc4.3 [deleted file]
tests/petsc/solver_09.cc
tests/petsc/solver_09/cmp/x86_64-unknown-linux-gnu+gcc4.2 [new file with mode: 0644]
tests/petsc/solver_09/cmp/x86_64-unknown-linux-gnu+gcc4.3
tests/petsc/solver_10.cc
tests/petsc/solver_10/cmp/x86_64-unknown-linux-gnu+gcc4.3 [deleted file]
tests/petsc/solver_11.cc
tests/petsc/solver_11/cmp/x86_64-unknown-linux-gnu+gcc4.2 [new file with mode: 0644]

index 6b931601191f57720d12b5b447f6726dce23083f..350818cdddf47d14d524038da2620cab1a4df8ff 100644 (file)
@@ -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);
 
index 6eacb4aa590d2d95b53488aa8d7dc3081e2bc1b0..e5e3067846f9983f761697cfa5db14a0ee320def 100644 (file)
@@ -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
index 52d42a5120fe49e3d304ef30aaa6dc37d6e2900b..55959c412b842fd49aa810ca7bb7c8cec8ee2707 100644 (file)
@@ -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);
 
index 26caa7600bb8d96d4959be02e11800c025422b13..4cbd6cc5d7e76fbbf267d8f1a61d64d278968124 100644 (file)
@@ -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
index c3f763204ff55b32349fd3b53716d9b55d806f16..4607a57cbb450c605e3257acac8d3b4fc8eca262 100644 (file)
@@ -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 (file)
index f5f69d5..0000000
+++ /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
index 3bf12f60f1f7ce1a9db773bc805a07c3ecb0f8d4..131da7150f865ba7905cb7ae47f434270dafe0e1 100644 (file)
@@ -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 (file)
index bd77038..0000000
+++ /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
index 95d5f5797786365639f862ada0832c646c31ff8e..fc7d6ebee5d61b14f34cb2fd41ed0d023de469af 100644 (file)
@@ -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 (file)
index cbb7e73..0000000
+++ /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
index 36c63d2e3a15291f2ec06bb35ed99871f00f13c5..7ac66b800f593f71e6693bc69396c262a0a02442 100644 (file)
@@ -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 (file)
index a63b8c0..0000000
+++ /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
index 81bab513b59b2f0e0f94b090b36b6489e506cfdb..c767e2b9068ef251bb1e8d15e48832022fdc28d6 100644 (file)
@@ -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 (file)
index a0c8377..0000000
+++ /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
index 05ebfea704578bb7f3feb058d7344ec18109b6af..357eb5a63d7e94b1f16b9691b2ca6e9dc6d3fdc6 100644 (file)
@@ -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 (file)
index 44201cb..0000000
+++ /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
index b1326285c6cf50009ad9bacdda9e100386fb1d01..a009a5072521fbc5186f9d9c543243522804a179 100644 (file)
@@ -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 (file)
index a973254..0000000
+++ /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
index 928df89e0de330020a0234c2f240cef54a0fd9d1..68c84b03e20df6bef9405db180fc8065a8f07902 100644 (file)
@@ -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 (file)
index 2f1ce6e..0000000
+++ /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
index b920798e00ccee16be733eeceb23c60cc8574a68..e547c76bc6d63bc730ef86ae863dda535cf508a9 100644 (file)
@@ -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 (file)
index 0000000..34a2267
--- /dev/null
@@ -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
index 1c6b7a12b33e5a3e79c3d52b1b203de84a817e8c..34a22672b03728ee0b77696bdf95c075ca3ff85d 100644 (file)
@@ -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
index c8a63ae6462d202914d7623e00c275140fafc4c1..26e283826aadff0ca266db8d76558629610b3c64 100644 (file)
@@ -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 (file)
index 4706970..0000000
+++ /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
index a807d3080808953f9b3ca127f19d7e78b3daa750..8ecee4483f093de15844782f65e87507b0736cef 100644 (file)
@@ -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 (file)
index 0000000..3b0d986
--- /dev/null
@@ -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

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.