Use initlog() in grid/ tests.

diff --git a/tests/grid/enclosing_sphere_01.cc b/tests/grid/enclosing_sphere_01.cc
index 13218c85adccc4c39cb4467620cf32f9cb3855d6..45a0dd7af6c59c22d9e8c5da0244b25df13f21e0 100644 (file)
--- a/tests/grid/enclosing_sphere_01.cc
+++ b/tests/grid/enclosing_sphere_01.cc
@@ -207,9 +207,8 @@ test()
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(PRECISION);
-  deallog.attach(logfile);
 
   test<2>();
   test<3>();

diff --git a/tests/grid/grid_hyper_shell.cc b/tests/grid/grid_hyper_shell.cc
index 58b103ebe355c524362384b6a7b086d1afb7143d..62fa18e90d75887bad0db93a62b927a88c2d5f2c 100644 (file)
--- a/tests/grid/grid_hyper_shell.cc
+++ b/tests/grid/grid_hyper_shell.cc
@@ -30,9 +30,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check(double r1, double r2, unsigned int n)
@@ -85,15 +82,15 @@ check(double r1, double r2, unsigned int n)
   GridOutFlags::DX flags;
   flags.write_faces = true;
   grid_out.set_flags(flags);
-  grid_out.write_dx(tria, logfile);
+  grid_out.write_dx(tria, deallog.get_file_stream());
 }
 
 
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(3);
-  deallog.attach(logfile);
 
   check<2>(4., 5., 10);
   check<3>(3., 5., 6);

diff --git a/tests/grid/grid_hyper_shell_02.cc b/tests/grid/grid_hyper_shell_02.cc
index fe35a7f257e23cd75452884950be1942bb69f987..7aae10a5aa2b6f74d0c28e9235d316aece97ef49 100644 (file)
--- a/tests/grid/grid_hyper_shell_02.cc
+++ b/tests/grid/grid_hyper_shell_02.cc
@@ -29,9 +29,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check(double r1, double r2, unsigned int n)
@@ -44,15 +41,15 @@ check(double r1, double r2, unsigned int n)
   tria.refine_global(1);
 
   GridOut grid_out;
-  grid_out.write_gnuplot(tria, logfile);
+  grid_out.write_gnuplot(tria, deallog.get_file_stream());
 }
 
 
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(3);
-  deallog.attach(logfile);
 
   check<3>(.5, 1, 6);
 }

diff --git a/tests/grid/grid_hyper_shell_03.cc b/tests/grid/grid_hyper_shell_03.cc
index b2a078eace12b92d58662f81283bf2833b7b17a1..ea0b4b94c345d71fb9bd9ea0b0d5fdbdc932e2ff 100644 (file)
--- a/tests/grid/grid_hyper_shell_03.cc
+++ b/tests/grid/grid_hyper_shell_03.cc
@@ -29,9 +29,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check(double r1, double r2, unsigned int n)
@@ -44,15 +41,15 @@ check(double r1, double r2, unsigned int n)
   tria.refine_global(1);
 
   GridOut grid_out;
-  grid_out.write_gnuplot(tria, logfile);
+  grid_out.write_gnuplot(tria, deallog.get_file_stream());
 }
 
 
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(3);
-  deallog.attach(logfile);
 
   check<3>(.5, 1, 12);
 }

diff --git a/tests/grid/grid_hyper_shell_04.cc b/tests/grid/grid_hyper_shell_04.cc
index f3de8a083dec0efd5a7c39e31618d8dbfe948373..b6b9f5e436ff72f5193d5094b4d33f1aafcc0fb2 100644 (file)
--- a/tests/grid/grid_hyper_shell_04.cc
+++ b/tests/grid/grid_hyper_shell_04.cc
@@ -29,9 +29,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check(double r1, double r2, unsigned int n)
@@ -43,15 +40,15 @@ check(double r1, double r2, unsigned int n)
   tria.set_manifold(0, boundary);
 
   GridOut grid_out;
-  grid_out.write_gnuplot(tria, logfile);
+  grid_out.write_gnuplot(tria, deallog.get_file_stream());
 }
 
 
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(3);
-  deallog.attach(logfile);
 
   check<3>(.5, 1, 96);
 }

diff --git a/tests/grid/grid_hyper_shell_05.cc b/tests/grid/grid_hyper_shell_05.cc
index 4c21bd45dbcf860551e997a845be10135dfa899a..85afd94be3b2a0f53599f4a51c154c232bbf7318 100644 (file)
--- a/tests/grid/grid_hyper_shell_05.cc
+++ b/tests/grid/grid_hyper_shell_05.cc
@@ -35,9 +35,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check(const unsigned int n)
@@ -74,8 +71,8 @@ check(const unsigned int n)
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(3);
-  deallog.attach(logfile);
 
   check<3>(6);
   check<3>(12);

diff --git a/tests/grid/grid_hyper_shell_06.cc b/tests/grid/grid_hyper_shell_06.cc
index 2cc5f1b29eb81a56ee66abdf9d351f814035b9f2..734866bf0f9b3779921acc525c2a5eeacc7443db 100644 (file)
--- a/tests/grid/grid_hyper_shell_06.cc
+++ b/tests/grid/grid_hyper_shell_06.cc
@@ -31,9 +31,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check(double r1, double r2, unsigned int n)
@@ -61,8 +58,8 @@ check(double r1, double r2, unsigned int n)
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(3);
-  deallog.attach(logfile);
 
   check<3>(.5, 1, 6);
   check<3>(.5, 1, 12);

diff --git a/tests/grid/grid_in.cc b/tests/grid/grid_in.cc
index a701a260ef888cb41f72c2d1c830336f06a1dc83..ce1ad6d3f5ebd11fdbc844ba64bc0a0025a5ad3d 100644 (file)
--- a/tests/grid/grid_in.cc
+++ b/tests/grid/grid_in.cc
@@ -29,9 +29,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 test1()
@@ -44,7 +41,7 @@ test1()
 
   GridOut grid_out;
   grid_out.set_flags(GridOutFlags::Ucd(true));
-  grid_out.write_ucd(tria, logfile);
+  grid_out.write_ucd(tria, deallog.get_file_stream());
 }
 
 
@@ -145,9 +142,8 @@ filename_resolution()
 int
 main()
 {
-  deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
+  initlog();
+  deallog.get_file_stream() << std::setprecision(2);
 
   test1<2>();
   test2<2>();

diff --git a/tests/grid/grid_in_3d.cc b/tests/grid/grid_in_3d.cc
index 7c4190e8d20e833f8432f8b20fd7373f06e41669..8a32da41ec1c1c5602cc3e412f09937ae6d514cb 100644 (file)
--- a/tests/grid/grid_in_3d.cc
+++ b/tests/grid/grid_in_3d.cc
@@ -32,9 +32,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
-
 void
 test(const char *filename)
 {
@@ -85,8 +82,8 @@ test1()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  deallog.attach(logfile);
 
   test(SOURCE_DIR "/grid_in_3d/1.in");
   test(SOURCE_DIR "/grid_in_3d/2.in");

diff --git a/tests/grid/grid_in_3d_02.cc b/tests/grid/grid_in_3d_02.cc
index 95f5c43793a8132633df054d66323e9acac93400..7619f7829f87f76a68a8f0f4c59cdca2212dc457 100644 (file)
--- a/tests/grid/grid_in_3d_02.cc
+++ b/tests/grid/grid_in_3d_02.cc
@@ -35,11 +35,6 @@
 // #include <deal.II/fe/fe_q.h>
 // #include <deal.II/numerics/data_out.h>
 
-
-
-std::ofstream logfile("output");
-
-
 void
 test(const char *filename)
 {
@@ -88,8 +83,8 @@ test(const char *filename)
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  deallog.attach(logfile);
 
   test(SOURCE_DIR "/grid_in_3d_02/747.ucd");
 }

diff --git a/tests/grid/grid_in_msh.cc b/tests/grid/grid_in_msh.cc
index 761388a03ea1d2e421b01343ef461cba63b2ed7e..08f24b4bf1d7754c4ccfcdccb0c327e368c2f241 100644 (file)
--- a/tests/grid/grid_in_msh.cc
+++ b/tests/grid/grid_in_msh.cc
@@ -30,9 +30,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check_file(const std::string name, typename GridIn<dim>::Format format)
@@ -57,9 +54,8 @@ filename_resolution()
 int
 main()
 {
-  deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
+  initlog();
+  deallog.get_file_stream() << std::setprecision(2);
 
   filename_resolution();
 }

diff --git a/tests/grid/grid_in_msh_02.cc b/tests/grid/grid_in_msh_02.cc
index d1410859721d991e8d09b58b0b7e52449434da1d..65cbc60f0a2499c2fc009af15e2ec6db6b0cb7cd 100644 (file)
--- a/tests/grid/grid_in_msh_02.cc
+++ b/tests/grid/grid_in_msh_02.cc
@@ -34,9 +34,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 void
 check_file()
 {
@@ -64,9 +61,8 @@ check_file()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   check_file();
 }

diff --git a/tests/grid/grid_in_msh_02_13.cc b/tests/grid/grid_in_msh_02_13.cc
index 90e81e0170bf887fdc4951d805a72c8e06295d69..b8f977500a33eb865b0529a07701ca1da9dac41f 100644 (file)
--- a/tests/grid/grid_in_msh_02_13.cc
+++ b/tests/grid/grid_in_msh_02_13.cc
@@ -38,9 +38,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 void
 check_file()
 {
@@ -68,9 +65,8 @@ check_file()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   check_file();
 }

diff --git a/tests/grid/grid_in_msh_03.cc b/tests/grid/grid_in_msh_03.cc
index 755240229370b7732aeb0a3babacafa7d72b658a..5a89e890cd2dee42a039b8aa743743529dd00998 100644 (file)
--- a/tests/grid/grid_in_msh_03.cc
+++ b/tests/grid/grid_in_msh_03.cc
@@ -32,9 +32,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check_file(const std::string name, typename GridIn<dim>::Format format)
@@ -62,9 +59,8 @@ filename_resolution()
 int
 main()
 {
-  deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
+  initlog(false, std::ios_base::fmtflags());
+  deallog.get_file_stream() << std::setprecision(2);
 
   filename_resolution();
 }

diff --git a/tests/grid/grid_in_msh_version_1.cc b/tests/grid/grid_in_msh_version_1.cc
index 825417d2ff50920f171a3b2c79279a9e7f1427e1..6f17681852922c1a74909e22ea7b01854fdd6038 100644 (file)
--- a/tests/grid/grid_in_msh_version_1.cc
+++ b/tests/grid/grid_in_msh_version_1.cc
@@ -32,9 +32,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check_file(const std::string name, typename GridIn<dim>::Format format)
@@ -66,9 +63,8 @@ filename_resolution()
 int
 main()
 {
-  deallog << std::setprecision(5);
-  logfile << std::setprecision(5);
-  deallog.attach(logfile);
+  initlog();
+  deallog.get_file_stream() << std::setprecision(5);
 
   filename_resolution();
 }

diff --git a/tests/grid/grid_in_msh_version_2.cc b/tests/grid/grid_in_msh_version_2.cc
index b8fa7fa05478babf0b75a221cbaaa17532a875b2..f7692c6785241442c4a6ecc878c280083537ea7f 100644 (file)
--- a/tests/grid/grid_in_msh_version_2.cc
+++ b/tests/grid/grid_in_msh_version_2.cc
@@ -31,9 +31,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check_file(const std::string name, typename GridIn<dim>::Format format)
@@ -61,9 +58,8 @@ filename_resolution()
 int
 main()
 {
-  deallog << std::setprecision(5);
-  logfile << std::setprecision(5);
-  deallog.attach(logfile);
+  initlog();
+  deallog.get_file_stream() << std::setprecision(5);
 
   filename_resolution();
 }

diff --git a/tests/grid/grid_in_tecplot.cc b/tests/grid/grid_in_tecplot.cc
index e2158c4554bb7c9c680d2ae4fdd6b9c1469e3933..ba6091680a0c444f75e4180113ebf589e5b35fd9 100644 (file)
--- a/tests/grid/grid_in_tecplot.cc
+++ b/tests/grid/grid_in_tecplot.cc
@@ -24,9 +24,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 test(const std::string &infilename)
@@ -36,16 +33,18 @@ test(const std::string &infilename)
   gi.attach_triangulation(tria);
   gi.read(infilename);
 
-  logfile << "------------------------------------------" << std::endl;
+  deallog.get_file_stream()
+    << "------------------------------------------" << std::endl;
 
   GridOut grid_out;
   grid_out.set_flags(GridOutFlags::Ucd(true));
-  grid_out.write_ucd(tria, logfile);
+  grid_out.write_ucd(tria, deallog.get_file_stream());
 }
 
 int
 main()
 {
+  initlog();
   test<2>(std::string(SOURCE_DIR "/grid_in_tecplot/1.dat"));
   test<2>(std::string(SOURCE_DIR "/grid_in_tecplot/2.dat"));
   test<2>(std::string(SOURCE_DIR "/grid_in_tecplot/3.dat"));

diff --git a/tests/grid/grid_in_tecplot.output b/tests/grid/grid_in_tecplot.output
index ed7fc29fe1e156d9694dd23c6ee0db07c51e7790..5a49ddc6ade91268b0b3c64f271f001800ab287d 100644 (file)
--- a/tests/grid/grid_in_tecplot.output
+++ b/tests/grid/grid_in_tecplot.output
@@ -1,3 +1,4 @@
+
 ------------------------------------------
 # This file was generated by the deal.II library.
 

diff --git a/tests/grid/grid_in_unv_2d.cc b/tests/grid/grid_in_unv_2d.cc
index e4f528414f27bc3d1c16f603d4c6f7aa931dfa6b..1ee3f8c56146eb6bd08145203ee365f097c1914d 100644 (file)
--- a/tests/grid/grid_in_unv_2d.cc
+++ b/tests/grid/grid_in_unv_2d.cc
@@ -33,9 +33,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check_file(const std::string name, typename GridIn<dim>::Format format)
@@ -63,9 +60,8 @@ filename_resolution()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   filename_resolution();
 }

diff --git a/tests/grid/grid_in_unv_3d.cc b/tests/grid/grid_in_unv_3d.cc
index 37eb1555253207c3677f99079951351941f1f980..5bec4f673d909b63e701b78c3d43ba9fda52ad14 100644 (file)
--- a/tests/grid/grid_in_unv_3d.cc
+++ b/tests/grid/grid_in_unv_3d.cc
@@ -33,9 +33,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check_file(const std::string name, typename GridIn<dim>::Format format)
@@ -60,9 +57,8 @@ filename_resolution()
 int
 main()
 {
-  deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
+  initlog();
+  deallog.get_file_stream() << std::setprecision(2);
 
   filename_resolution();
 }

diff --git a/tests/grid/grid_in_unv_3d_02.cc b/tests/grid/grid_in_unv_3d_02.cc
index cb1646a1e95159838ecbca03919e591d78c79c22..98b5ebbbea6ad723b52d7fc12536849d92955fc4 100644 (file)
--- a/tests/grid/grid_in_unv_3d_02.cc
+++ b/tests/grid/grid_in_unv_3d_02.cc
@@ -34,9 +34,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check_file(const std::string name, typename GridIn<dim>::Format format)
@@ -62,9 +59,8 @@ filename_resolution()
 int
 main()
 {
-  deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
+  initlog();
+  deallog.get_file_stream() << std::setprecision(2);
 
   filename_resolution();
 }

diff --git a/tests/grid/grid_in_vtk_2d.cc b/tests/grid/grid_in_vtk_2d.cc
index bb7cdb3c81683ae59e6e039c53120e2af96754dc..29f74c26b53f43ead5799ce24518e7bca5b20480 100644 (file)
--- a/tests/grid/grid_in_vtk_2d.cc
+++ b/tests/grid/grid_in_vtk_2d.cc
@@ -30,9 +30,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check_file(const std::string name, typename GridIn<dim>::Format format)
@@ -57,9 +54,8 @@ filename_resolution()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   filename_resolution();
 }

diff --git a/tests/grid/grid_in_vtk_3d.cc b/tests/grid/grid_in_vtk_3d.cc
index fb609b60aba7b91d98f30d24e177af3536a58291..aeae3864fca395bbcce9bcffe2dabde1d6f78558 100644 (file)
--- a/tests/grid/grid_in_vtk_3d.cc
+++ b/tests/grid/grid_in_vtk_3d.cc
@@ -30,9 +30,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check_file(const std::string name, typename GridIn<dim>::Format format)
@@ -57,9 +54,8 @@ filename_resolution()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   filename_resolution();
 }

diff --git a/tests/grid/grid_in_vtk_3d_02.cc b/tests/grid/grid_in_vtk_3d_02.cc
index d5770a0f65a15f0283e1455b84d9251fd70c8fb0..4a389b9215e1284b1a3f0ebfcb08cf4d6c419374 100644 (file)
--- a/tests/grid/grid_in_vtk_3d_02.cc
+++ b/tests/grid/grid_in_vtk_3d_02.cc
@@ -30,9 +30,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check_file(const std::string name, typename GridIn<dim>::Format format)
@@ -58,9 +55,8 @@ filename_resolution()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   filename_resolution();
 }

diff --git a/tests/grid/grid_in_vtk_3d_03.cc b/tests/grid/grid_in_vtk_3d_03.cc
index afe9039871d387aff018bf2f5cb0a11dbe1de379..83f5ad9474375186b49cd831783f4fdd1b706070 100644 (file)
--- a/tests/grid/grid_in_vtk_3d_03.cc
+++ b/tests/grid/grid_in_vtk_3d_03.cc
@@ -30,9 +30,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check_file(const std::string name, typename GridIn<dim>::Format format)
@@ -58,9 +55,8 @@ filename_resolution()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   filename_resolution();
 }

diff --git a/tests/grid/grid_in_vtk_3d_04.cc b/tests/grid/grid_in_vtk_3d_04.cc
index 448c8d4af688587d84dc415deea7d507a60493af..726e677fc30cad50f0cc78f1009708cd599cdb5f 100644 (file)
--- a/tests/grid/grid_in_vtk_3d_04.cc
+++ b/tests/grid/grid_in_vtk_3d_04.cc
@@ -30,9 +30,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 check_file(const std::string name, typename GridIn<dim>::Format format)
@@ -70,9 +67,8 @@ filename_resolution()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   filename_resolution();
 }

diff --git a/tests/grid/grid_invert.cc b/tests/grid/grid_invert.cc
index bb4fb929f162a6fe3a0d5588db1f4cfed9a719fa..33411dc5de0a8e46e7a4fdb037ab37287a5acaa1 100644 (file)
--- a/tests/grid/grid_invert.cc
+++ b/tests/grid/grid_invert.cc
@@ -24,8 +24,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
 template <int dim>
 void
 test(bool second_case = false)
@@ -62,6 +60,7 @@ test(bool second_case = false)
   Triangulation<dim> tria;
   tria.create_triangulation_compatibility(vertices, cells, subcelldata);
 
+  std::ostream &logfile = deallog.get_file_stream();
   logfile << "---------------------------------------------" << std::endl
           << "dim=" << dim << (second_case ? ", second case" : ", first case")
           << std::endl
@@ -75,6 +74,7 @@ test(bool second_case = false)
 int
 main()
 {
+  initlog(false, std::ios_base::fmtflags());
   test<2>();
   test<3>(false);
   test<3>(true);

diff --git a/tests/grid/grid_invert.output b/tests/grid/grid_invert.output
index 47f4a40cf4e5c3c0c13f6d03ff70c1fd15d24b7d..26db67300dd543023f91cb0363784ff6397c2184 100644 (file)
--- a/tests/grid/grid_invert.output
+++ b/tests/grid/grid_invert.output
@@ -1,3 +1,4 @@
+
 ---------------------------------------------
 dim=2, first case
 
@@ -12,7 +13,7 @@ dim=2, first case
 2  0 1 0
 3  1 1 0
 4  1 0 0
-1 0 quad    1 4 3 2 
+1 0 quad    1 4 3 2
 ---------------------------------------------
 dim=3, first case
 
@@ -31,7 +32,7 @@ dim=3, first case
 6  0 1 -1
 7  1 1 -1
 8  1 0 -1
-1 0 hex     5 6 7 8 1 2 3 4 
+1 0 hex     5 6 7 8 1 2 3 4
 ---------------------------------------------
 dim=3, second case
 
@@ -50,4 +51,4 @@ dim=3, second case
 6  0 1 1
 7  1 1 1
 8  1 0 1
-1 0 hex     5 8 7 6 1 4 3 2 
+1 0 hex     5 8 7 6 1 4 3 2

diff --git a/tests/grid/grid_out.cc b/tests/grid/grid_out.cc
index a22b8b149f029389c59edb596f52eb76629d2dd6..707a72f68004d3840f33a5d84d7d566dccdb8b76 100644 (file)
--- a/tests/grid/grid_out.cc
+++ b/tests/grid/grid_out.cc
@@ -26,9 +26,6 @@
 
 
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 test()
@@ -50,21 +47,20 @@ test()
   grid_out.set_flags(eps2);
 
   if (dim != 1)
-    grid_out.write_eps(tria, logfile);
-  grid_out.write_gnuplot(tria, logfile);
+    grid_out.write_eps(tria, deallog.get_file_stream());
+  grid_out.write_gnuplot(tria, deallog.get_file_stream());
   grid_out.set_flags(GridOutFlags::Ucd(true));
-  grid_out.write_ucd(tria, logfile);
+  grid_out.write_ucd(tria, deallog.get_file_stream());
   if (dim != 1)
-    grid_out.write_dx(tria, logfile);
+    grid_out.write_dx(tria, deallog.get_file_stream());
 }
 
 
 int
 main()
 {
-  deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
+  initlog();
+  deallog.get_file_stream() << std::setprecision(2);
 
   test<1>();
   test<2>();

diff --git a/tests/grid/grid_out_02.cc b/tests/grid/grid_out_02.cc
index a9969984f4ee047735fb11ed1f284e53ee966718..d619414c719912dd48d933ab26b526cff51fbbf7 100644 (file)
--- a/tests/grid/grid_out_02.cc
+++ b/tests/grid/grid_out_02.cc
@@ -33,9 +33,6 @@
 
 
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 test()
@@ -45,7 +42,7 @@ test()
   tria.refine_global(2);
 
   GridOut grid_out;
-  grid_out.write_dx(tria, logfile);
+  grid_out.write_dx(tria, deallog.get_file_stream());
 
   typename Triangulation<dim>::active_cell_iterator cell = tria.begin_active();
   for (unsigned int i = 0; i < GeometryInfo<dim>::max_children_per_cell; ++i)
@@ -54,16 +51,15 @@ test()
       ++cell;
     }
   tria.execute_coarsening_and_refinement();
-  grid_out.write_dx(tria, logfile);
+  grid_out.write_dx(tria, deallog.get_file_stream());
 }
 
 
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   test<2>();
   test<3>();

diff --git a/tests/grid/grid_out_03.cc b/tests/grid/grid_out_03.cc
index c796ce0131db426d5d31a887deb3d4e026f13cd2..f7464d57aaaa319313702ec3e6b6cd29b4f552a3 100644 (file)
--- a/tests/grid/grid_out_03.cc
+++ b/tests/grid/grid_out_03.cc
@@ -30,11 +30,6 @@
 
 #include "../tests.h"
 
-
-
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 test()
@@ -48,16 +43,15 @@ test()
   GridOutFlags::Ucd flags;
   flags.write_lines = flags.write_faces = true;
   grid_out.set_flags(flags);
-  grid_out.write_ucd(tria, logfile);
+  grid_out.write_ucd(tria, deallog.get_file_stream());
 }
 
 
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   test<2>();
   test<3>();

diff --git a/tests/grid/grid_out_04.cc b/tests/grid/grid_out_04.cc
index 78a3a9145c1351e2e4a8ba0217249ea85173b733..7a82024651cd33d7820bb36bd0a275031e7352ef 100644 (file)
--- a/tests/grid/grid_out_04.cc
+++ b/tests/grid/grid_out_04.cc
@@ -30,11 +30,6 @@
 
 #include "../tests.h"
 
-
-
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 test()
@@ -48,16 +43,15 @@ test()
   GridOutFlags::Msh flags;
   flags.write_lines = flags.write_faces = true;
   grid_out.set_flags(flags);
-  grid_out.write_msh(tria, logfile);
+  grid_out.write_msh(tria, deallog.get_file_stream());
 }
 
 
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   test<2>();
   test<3>();

diff --git a/tests/grid/grid_out_08.cc b/tests/grid/grid_out_08.cc
index bbd29cb04d7922826d438d36effa45859ca34595..e990471957148a69665ba4d714c0396d884f3f10 100644 (file)
--- a/tests/grid/grid_out_08.cc
+++ b/tests/grid/grid_out_08.cc
@@ -29,11 +29,6 @@
 
 #include "../tests.h"
 
-
-
-std::ofstream logfile("output");
-
-
 void
 test()
 {
@@ -77,16 +72,15 @@ test()
   tria.refine_global(1);
 
   GridOut grid_out;
-  grid_out.write_vtu(tria, logfile);
+  grid_out.write_vtu(tria, deallog.get_file_stream());
 }
 
 
 int
 main()
 {
-  deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
+  initlog();
+  deallog.get_file_stream() << std::setprecision(2);
 
   test();
 }

diff --git a/tests/grid/grid_out_09.cc b/tests/grid/grid_out_09.cc
index 60f92899a2191f00ff3beda493098b092b7aed0b..5cb672dd876eb07d926c4493fa9c6921ad7f1944 100644 (file)
--- a/tests/grid/grid_out_09.cc
+++ b/tests/grid/grid_out_09.cc
@@ -29,11 +29,6 @@
 
 #include "../tests.h"
 
-
-
-std::ofstream logfile("output");
-
-
 void
 test()
 {
@@ -77,16 +72,15 @@ test()
   tria.refine_global(1);
 
   GridOut grid_out;
-  grid_out.write_gnuplot(tria, logfile);
+  grid_out.write_gnuplot(tria, deallog.get_file_stream());
 }
 
 
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   test();
 }

diff --git a/tests/grid/grid_output_input.cc b/tests/grid/grid_output_input.cc
index 83693318d097ae1d77349ed8264f4cd86d478377..848512197ad8b25eb2b50c1b1fabf50b68f164d3 100644 (file)
--- a/tests/grid/grid_output_input.cc
+++ b/tests/grid/grid_output_input.cc
@@ -79,10 +79,9 @@ test(std::ostream &out)
 int
 main()
 {
-  std::ofstream logfile("output");
-  deallog.attach(logfile);
+  initlog();
 
   deallog.push("3d");
-  test<3>(logfile);
+  test<3>(deallog.get_file_stream());
   deallog.pop();
 }

diff --git a/tests/grid/grid_parallelepiped.cc b/tests/grid/grid_parallelepiped.cc
index 6c59377a518ab9a093e640b968ffafab042ed875..8b5448397958521c935f9a31a88715c7727b01e2 100644 (file)
--- a/tests/grid/grid_parallelepiped.cc
+++ b/tests/grid/grid_parallelepiped.cc
@@ -28,9 +28,6 @@
 
 #include "../tests.h"
 
-// Output
-std::ofstream logfile("output");
-
 // The simplest test case is to create a parallelepiped grid, output
 // the result, and hope for the best.
 template <int dim>
@@ -69,7 +66,7 @@ check_parallelepiped(bool colorize, bool log)
   GridOut grid_out;
 
   if (log)
-    grid_out.write_gnuplot(triangulation, logfile);
+    grid_out.write_gnuplot(triangulation, deallog.get_file_stream());
 
   else
     grid_out.write_gnuplot(triangulation, std::cout);
@@ -80,6 +77,8 @@ check_parallelepiped(bool colorize, bool log)
 int
 main()
 {
+  initlog(false, std::ios_base::fmtflags());
+  deallog.get_file_stream() << std::setprecision(2);
   // Check parallelepiped
   check_parallelepiped<1>(false, true);
   check_parallelepiped<2>(false, true);

diff --git a/tests/grid/grid_parallelepiped.output b/tests/grid/grid_parallelepiped.output
index 0d29404628e61ef9836f69ac7c50a46401bbe965..c67771b9b8eaeed76d7dcf50bbd31d712ae4dc50 100644 (file)
--- a/tests/grid/grid_parallelepiped.output
+++ b/tests/grid/grid_parallelepiped.output
@@ -1,3 +1,4 @@
+
 0 0 0
 0.5 0 0
 

diff --git a/tests/grid/grid_parallelepiped_01.cc b/tests/grid/grid_parallelepiped_01.cc
index 5200bf8ab8084c8c06c28a81037ecdf283732f79..b8cd5c5bb83220570ecc18d97dd721d0cc8386d6 100644 (file)
--- a/tests/grid/grid_parallelepiped_01.cc
+++ b/tests/grid/grid_parallelepiped_01.cc
@@ -29,9 +29,6 @@
 
 #include "../tests.h"
 
-// Output
-std::ofstream logfile("output");
-
 // As sketched in the deal.II docs, the parallelepiped class is just a
 // hyper_rectangle in 1d and a parallelogram in 2d. That can checked
 // by simple comparison to a reference triangulation.
@@ -53,6 +50,7 @@ check_1d_parallelepiped_by_comparison(bool log)
 
   if (log)
     {
+      std::ostream &logfile = deallog.get_file_stream();
       logfile << "\ncheck 1d parallelepiped (hyper_cube): ";
       if (GridTools::have_same_coarse_mesh(triangulation_parallelepiped,
                                            triangulation_cube))
@@ -82,6 +80,7 @@ check_2d_parallelepiped_by_comparison(bool log)
 
   if (log)
     {
+      std::ostream &logfile = deallog.get_file_stream();
       logfile << "\ncheck 2d parallelepiped (parallelogram): ";
       if (GridTools::have_same_coarse_mesh(triangulation_parallelepiped,
                                            triangulation_parallelogram))
@@ -96,8 +95,9 @@ check_2d_parallelepiped_by_comparison(bool log)
 int
 main()
 {
+  initlog();
   // Check parallelepiped
   check_1d_parallelepiped_by_comparison(true);
   check_2d_parallelepiped_by_comparison(true);
-  logfile << "\n";
+  deallog.get_file_stream() << "\n";
 }

diff --git a/tests/grid/grid_parallelepiped_01.output b/tests/grid/grid_parallelepiped_01.output
index 00d8d10f253b8b1bae01b1cf35c134114d8c6c4d..4357ca77d72c0b093f2dc22b8e955ba2e0c81ace 100644 (file)
--- a/tests/grid/grid_parallelepiped_01.output
+++ b/tests/grid/grid_parallelepiped_01.output
@@ -1,3 +1,4 @@
 
+
 check 1d parallelepiped (hyper_cube): OK
 check 2d parallelepiped (parallelogram): OK

diff --git a/tests/grid/grid_parallelepiped_02.cc b/tests/grid/grid_parallelepiped_02.cc
index 6dbb90b7601e8e48353a2b3e38998d7ed8733a12..0ee6e79a5a39026bc9337de442ee60b75deb1e51 100644 (file)
--- a/tests/grid/grid_parallelepiped_02.cc
+++ b/tests/grid/grid_parallelepiped_02.cc
@@ -29,9 +29,6 @@
 
 #include "../tests.h"
 
-// Output
-std::ofstream logfile("output");
-
 // This test creates a parallelepiped (one element) and the same
 // parallelepiped (one element); because the code that makes the two
 // one-element grids is not the same, but should result in the same
@@ -82,26 +79,26 @@ check_nd_parallelepiped_by_comparison(bool log)
 
   if (log)
     {
-      logfile << "\ncheck " << dim
-              << "d parallelepiped (subdivided_parallelepiped): ";
+      deallog << "check " << dim
+              << "d parallelepiped (subdivided_parallelepiped):";
       if (GridTools::have_same_coarse_mesh(
             triangulation_parallelepiped,
             triangulation_subdivided_parallelepiped))
-        logfile << "OK";
+        deallog << "OK" << std::endl;
 
       else
-        logfile
-          << "not OK... coarse grids are different but they should be the same";
+        deallog
+          << "not OK... coarse grids are different but they should be the same"
+          << std::endl;
     }
 }
 
 int
 main()
 {
+  initlog();
   // Check parallelepiped
   check_nd_parallelepiped_by_comparison<1>(true);
   check_nd_parallelepiped_by_comparison<2>(true);
   check_nd_parallelepiped_by_comparison<3>(true);
-
-  logfile << "\n";
 }

diff --git a/tests/grid/grid_parallelepiped_02.output b/tests/grid/grid_parallelepiped_02.output
index b7e4598603ab74fba3249437f43a28338211fcc4..469e54b6d7077f5ea17944b077095fdcc1bd5777 100644 (file)
--- a/tests/grid/grid_parallelepiped_02.output
+++ b/tests/grid/grid_parallelepiped_02.output
@@ -1,4 +1,4 @@
 
-check 1d parallelepiped (subdivided_parallelepiped): OK
-check 2d parallelepiped (subdivided_parallelepiped): OK
-check 3d parallelepiped (subdivided_parallelepiped): OK
+DEAL::check 1d parallelepiped (subdivided_parallelepiped):OK
+DEAL::check 2d parallelepiped (subdivided_parallelepiped):OK
+DEAL::check 3d parallelepiped (subdivided_parallelepiped):OK

diff --git a/tests/grid/grid_parallelepiped_03.cc b/tests/grid/grid_parallelepiped_03.cc
index 6ffec8f142dd2ca6133491e59ee4172225961c6f..784821a3ae6b8d37724bb1d7a57c5a627dac4ce8 100644 (file)
--- a/tests/grid/grid_parallelepiped_03.cc
+++ b/tests/grid/grid_parallelepiped_03.cc
@@ -28,9 +28,6 @@
 
 #include "../tests.h"
 
-// Output
-std::ofstream logfile("output");
-
 // The simplest test case is to create a parallelepiped grid with a
 // number of subdivisions and output the result.
 template <int dim>
@@ -75,7 +72,7 @@ check_subdivided_parallelepiped(bool colorize, bool log)
   GridOut grid_out;
 
   if (log)
-    grid_out.write_gnuplot(triangulation, logfile);
+    grid_out.write_gnuplot(triangulation, deallog.get_file_stream());
 
   else
     grid_out.write_gnuplot(triangulation, std::cout);
@@ -86,6 +83,8 @@ check_subdivided_parallelepiped(bool colorize, bool log)
 int
 main()
 {
+  initlog(false, std::ios_base::fmtflags());
+  // deallog.get_file_stream() << std::setprecision(2);
   // Check parallelepiped
   check_subdivided_parallelepiped<1>(false, true);
   check_subdivided_parallelepiped<2>(false, true);

diff --git a/tests/grid/grid_parallelepiped_03.output b/tests/grid/grid_parallelepiped_03.output
index 7d23a5f2350c600895f552c18f68e4b6ded4fd0b..541aa3ef5767314f32cdbc4f5aa4b878b2bd0fd0 100644 (file)
--- a/tests/grid/grid_parallelepiped_03.output
+++ b/tests/grid/grid_parallelepiped_03.output
@@ -1,3 +1,4 @@
+
 0 0 0
 0.166667 0 0
 

diff --git a/tests/grid/grid_remove_anisotropy.cc b/tests/grid/grid_remove_anisotropy.cc
index 506ca55136f29af93b9684b879ad390c5e245af1..3dbbcdf02bb12e16c116746d3d3ddd3cffb79686 100644 (file)
--- a/tests/grid/grid_remove_anisotropy.cc
+++ b/tests/grid/grid_remove_anisotropy.cc
@@ -29,8 +29,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
 void
 check_remove_anisotropy()
 {
@@ -50,7 +48,7 @@ check_remove_anisotropy()
                                           /*max ratio =*/1.2);
 
   GridOut grid_out;
-  grid_out.write_vtk(triangulation, logfile);
+  grid_out.write_vtk(triangulation, deallog.get_file_stream());
 
   triangulation.clear();
 }
@@ -58,5 +56,6 @@ check_remove_anisotropy()
 int
 main()
 {
+  initlog();
   check_remove_anisotropy();
 }

diff --git a/tests/grid/grid_remove_anisotropy.output b/tests/grid/grid_remove_anisotropy.output
index 923eec1c9a1c15f5e1e98d4f86783fae06d07d93..15567c75f7741ff4780d0387ae265b872f3cb27f 100644 (file)
--- a/tests/grid/grid_remove_anisotropy.output
+++ b/tests/grid/grid_remove_anisotropy.output
@@ -1,5 +1,6 @@
+
 # vtk DataFile Version 3.0
-#This file was generated 
+#This file was generated
 ASCII
 DATASET UNSTRUCTURED_GRID
 
@@ -84,16 +85,16 @@ CELL_TYPES 8
 POINT_DATA 64
 SCALARS level double 1
 LOOKUP_TABLE default
-3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
 SCALARS manifold double 1
 LOOKUP_TABLE default
--1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 
+-1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
 SCALARS material double 1
 LOOKUP_TABLE default
-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 SCALARS subdomain double 1
 LOOKUP_TABLE default
-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 SCALARS level_subdomain double 1
 LOOKUP_TABLE default
-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

diff --git a/tests/grid/grid_remove_hanging_nodes.cc b/tests/grid/grid_remove_hanging_nodes.cc
index 3ff91faf6977d384e4780528080109fc09a6279b..fa44c88a76a73c5a184b6d9b14510a350329781f 100644 (file)
--- a/tests/grid/grid_remove_hanging_nodes.cc
+++ b/tests/grid/grid_remove_hanging_nodes.cc
@@ -23,12 +23,8 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 
-#include <iostream>
-
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
 void
 check_remove_hanging_nodes()
 {
@@ -52,7 +48,7 @@ check_remove_hanging_nodes()
   dealii::GridTools::remove_hanging_nodes(tria, /*isotropic=*/false);
 
   GridOut grid_out;
-  grid_out.write_vtk(tria, logfile);
+  grid_out.write_vtk(tria, deallog.get_file_stream());
 
   tria.clear();
 }
@@ -60,5 +56,6 @@ check_remove_hanging_nodes()
 int
 main()
 {
+  initlog();
   check_remove_hanging_nodes();
 }

diff --git a/tests/grid/grid_remove_hanging_nodes.output b/tests/grid/grid_remove_hanging_nodes.output
index 704daab87cc4032415f1079fd3af7e2535394c63..ae22cee470ad075ad07dc6ae6afa2ec5eda52331 100644 (file)
--- a/tests/grid/grid_remove_hanging_nodes.output
+++ b/tests/grid/grid_remove_hanging_nodes.output
@@ -1,5 +1,6 @@
+
 # vtk DataFile Version 3.0
-#This file was generated 
+#This file was generated
 ASCII
 DATASET UNSTRUCTURED_GRID
 
@@ -192,16 +193,16 @@ CELL_TYPES 36
 POINT_DATA 144
 SCALARS level double 1
 LOOKUP_TABLE default
-2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
 SCALARS manifold double 1
 LOOKUP_TABLE default
--1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 
+-1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
 SCALARS material double 1
 LOOKUP_TABLE default
-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 SCALARS subdomain double 1
 LOOKUP_TABLE default
-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 SCALARS level_subdomain double 1
 LOOKUP_TABLE default
-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

diff --git a/tests/grid/grid_test.cc b/tests/grid/grid_test.cc
index 298da36b87604b12c4767de28996fc6c901498aa..64804314302416d8d4a6e83ae3be233c51c6d407 100644 (file)
--- a/tests/grid/grid_test.cc
+++ b/tests/grid/grid_test.cc
@@ -25,13 +25,10 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
 // 1: continuous refinement of the unit square always in the middle
 // 2: refinement of the circle at the boundary
 // 2: refinement of a wiggled area at the boundary
 
-
 template <int dim>
 class Ball : public FlatManifold<dim>
 {
@@ -250,7 +247,7 @@ test(const int test_case)
 
   GridOut go;
   go.set_flags(GridOutFlags::Ucd(true));
-  go.write_ucd(tria, logfile);
+  go.write_ucd(tria, deallog.get_file_stream());
 
   deallog << "     Total number of cells        = " << tria.n_cells()
           << std::endl
@@ -264,9 +261,8 @@ test(const int test_case)
 int
 main()
 {
-  deallog << std::setprecision(8);
-  logfile << std::setprecision(8);
-  deallog.attach(logfile);
+  initlog();
+  deallog.get_file_stream() << std::setprecision(8);
 
   for (unsigned int i = 1; i <= 3; ++i)
     test<2>(i);

diff --git a/tests/grid/grid_tools.cc b/tests/grid/grid_tools.cc
index 1f0bb6707c15858d4c43110b865c5facb2c86195..55a0f17611c254d6db2850778a95d847b96c215d 100644 (file)
--- a/tests/grid/grid_tools.cc
+++ b/tests/grid/grid_tools.cc
@@ -23,10 +23,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
-
-
 // check GridTools::diameter
 template <int dim>
 void
@@ -68,6 +64,7 @@ test1()
 void
 test2()
 {
+  std::ostream &   logfile = deallog.get_file_stream();
   Triangulation<2> tria;
   GridGenerator::hyper_cube(tria);
 
@@ -88,9 +85,9 @@ test2()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(4);
-  logfile << std::setprecision(4);
-  deallog.attach(logfile);
+  deallog.get_file_stream() << std::setprecision(4);
 
   test1<1>();
   test1<2>();

diff --git a/tests/grid/grid_tools_02.cc b/tests/grid/grid_tools_02.cc
index 16d1850f9437672cbc62e9fad52492a9ebe5e5a3..2dacbe81c835e19f2e822382c1327e351bb6f8af 100644 (file)
--- a/tests/grid/grid_tools_02.cc
+++ b/tests/grid/grid_tools_02.cc
@@ -25,11 +25,6 @@
 
 #include "../tests.h"
 
-
-std::ofstream logfile("output");
-
-
-
 template <int dim>
 void
 test1()
@@ -55,9 +50,8 @@ test1()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(4);
-  logfile << std::setprecision(4);
-  deallog.attach(logfile);
 
   test1<1>();
   test1<2>();

diff --git a/tests/grid/grid_tools_03.cc b/tests/grid/grid_tools_03.cc
index db7cf8691bf1a23aeeec433567b01af271c5c27d..cb1aeeb6b2d95718f737f9a0cb5b4bd83a884332 100644 (file)
--- a/tests/grid/grid_tools_03.cc
+++ b/tests/grid/grid_tools_03.cc
@@ -26,10 +26,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
-
-
 template <int dim>
 void
 test1()
@@ -74,9 +70,8 @@ test1()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(4);
-  logfile << std::setprecision(4);
-  deallog.attach(logfile);
 
   test1<1>();
   test1<2>();

diff --git a/tests/grid/grid_tools_04.cc b/tests/grid/grid_tools_04.cc
index 65d00e5abf0d2cd225552b887770d6f87d360ca0..9e6c7a62017b8180c1e395148bb639bcef3df238 100644 (file)
--- a/tests/grid/grid_tools_04.cc
+++ b/tests/grid/grid_tools_04.cc
@@ -25,11 +25,6 @@
 
 #include "../tests.h"
 
-
-std::ofstream logfile("output");
-
-
-
 template <int dim>
 void
 test1()
@@ -54,9 +49,8 @@ test1()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(4);
-  logfile << std::setprecision(4);
-  deallog.attach(logfile);
 
   test1<1>();
   test1<2>();

diff --git a/tests/grid/grid_tools_05.cc b/tests/grid/grid_tools_05.cc
index ff31c7b0c02b2e5fb22ed2ffba4a9dae7bfc9aa2..430332ff107ca56f12f401834933bfc888a5d370 100644 (file)
--- a/tests/grid/grid_tools_05.cc
+++ b/tests/grid/grid_tools_05.cc
@@ -26,11 +26,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-using namespace dealii;
-
-
 /*
  * Generate a grid consisting of two disjoint cells, colorize the two
  * outermost faces. They will be matched via collect_periodic_faces.
@@ -183,9 +178,8 @@ print_match(const FaceIterator &  face_1,
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(4);
-  logfile << std::setprecision(4);
-  deallog.attach(logfile, false);
 
   deallog << "Test for 2D: Hypercube" << std::endl << std::endl;
 

diff --git a/tests/grid/grid_tools_05.output b/tests/grid/grid_tools_05.output
index 9cc1d116734b5a6c3a29609995df8a182bef0aa4..0ea1f966ee64451399960ad77668381580820e8b 100644 (file)
--- a/tests/grid/grid_tools_05.output
+++ b/tests/grid/grid_tools_05.output
@@ -1,3 +1,4 @@
+
 DEAL::Test for 2D: Hypercube
 DEAL::
 DEAL::face 1 :: -1.000 -3.000 :: 1.000 -3.000

diff --git a/tests/grid/grid_tools_06.cc b/tests/grid/grid_tools_06.cc
index 6bc5d226a203a1b85b706f39abc0ef08cd8aa37c..859184bfb8074f9a973e5a6259933fc9ae97979b 100644 (file)
--- a/tests/grid/grid_tools_06.cc
+++ b/tests/grid/grid_tools_06.cc
@@ -26,11 +26,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-using namespace dealii;
-
-
 /*
  * Generate a grid consisting of two disjoint cells, colorize the two
  * outermost faces. They will be matched via collect_periodic_faces
@@ -195,10 +190,8 @@ print_match(const FaceIterator &  face_1,
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(4);
-  logfile << std::setprecision(4);
-  deallog.attach(logfile, false);
-
   deallog << "Test for 2D: Hypercube" << std::endl << std::endl;
 
   for (int i = 0; i < 2; ++i)

diff --git a/tests/grid/grid_tools_06.output b/tests/grid/grid_tools_06.output
index e9ebc525afdb8e9563b4b0a69eb25e8bb2ea4b77..1fde49825d1b407be3c8839b6fd009b9f898715b 100644 (file)
--- a/tests/grid/grid_tools_06.output
+++ b/tests/grid/grid_tools_06.output
@@ -1,3 +1,4 @@
+
 DEAL::Test for 2D: Hypercube
 DEAL::
 DEAL::Triangulation: 0

diff --git a/tests/grid/grid_tools_vertex_to_cell_map_02.cc b/tests/grid/grid_tools_vertex_to_cell_map_02.cc
index c306eb590266227a73c8b035f0f8ca051e9d74a9..e329c037b411f0298100efb9f6eb75e87df56a8b 100644 (file)
--- a/tests/grid/grid_tools_vertex_to_cell_map_02.cc
+++ b/tests/grid/grid_tools_vertex_to_cell_map_02.cc
@@ -25,8 +25,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
 void
 test()
 {
@@ -70,9 +68,8 @@ test()
 int
 main(int argc, char *argv[])
 {
+  initlog();
   deallog << std::setprecision(4);
-  logfile << std::setprecision(4);
-  deallog.attach(logfile);
 
   test();
 

diff --git a/tests/grid/have_same_coarse_mesh_01.cc b/tests/grid/have_same_coarse_mesh_01.cc
index d18163a9c4c2ca11e45307c574ad67ed4e041598..7e6444ba0d0ec6b8157efb6cf08a588fbdd354d3 100644 (file)
--- a/tests/grid/have_same_coarse_mesh_01.cc
+++ b/tests/grid/have_same_coarse_mesh_01.cc
@@ -69,8 +69,7 @@ test()
 int
 main()
 {
-  std::ofstream logfile("output");
-  deallog.attach(logfile);
+  initlog();
 
   test<1>();
   test<2>();

diff --git a/tests/grid/have_same_coarse_mesh_02.cc b/tests/grid/have_same_coarse_mesh_02.cc
index 948e37bc97c22e57f27774f851c265a4d964498a..7c55e00b6f56ff6b8e632a36871ce0e6a570dfc6 100644 (file)
--- a/tests/grid/have_same_coarse_mesh_02.cc
+++ b/tests/grid/have_same_coarse_mesh_02.cc
@@ -77,8 +77,7 @@ test()
 int
 main()
 {
-  std::ofstream logfile("output");
-  deallog.attach(logfile);
+  initlog();
 
   test<1>();
   test<2>();

diff --git a/tests/grid/have_same_coarse_mesh_03.cc b/tests/grid/have_same_coarse_mesh_03.cc
index 0117d06fc7d7375e6a9a05c07bd24aa8bdfa8afb..80a621b8deb80efa184429e1827dab3c54c792c1 100644 (file)
--- a/tests/grid/have_same_coarse_mesh_03.cc
+++ b/tests/grid/have_same_coarse_mesh_03.cc
@@ -77,8 +77,7 @@ test()
 int
 main()
 {
-  std::ofstream logfile("output");
-  deallog.attach(logfile);
+  initlog();
 
   test<1>();
   test<2>();

diff --git a/tests/grid/intergrid_map.cc b/tests/grid/intergrid_map.cc
index b65daedaf557ceedbaf080c762c8a9f93c4134b9..7406b61a1ce4a40663a62017996d16f6ac9ace63 100644 (file)
--- a/tests/grid/intergrid_map.cc
+++ b/tests/grid/intergrid_map.cc
@@ -114,11 +114,9 @@ check()
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(2);
 
-  deallog.attach(logfile);
-
   check<1>();
   check<2>();
   check<3>();

diff --git a/tests/grid/line_coarsening_3d.cc b/tests/grid/line_coarsening_3d.cc
index c9644c28d0c900bf171d9e97ec6a369668262be9..08a869ebaa5c3c3bfbb6058bac4378a40e499814 100644 (file)
--- a/tests/grid/line_coarsening_3d.cc
+++ b/tests/grid/line_coarsening_3d.cc
@@ -24,9 +24,6 @@
 
 
 
-std::ofstream logfile("output");
-
-
 // create a triangulation of a cylinder, where the line along the axis is common
 // to all cells, thus n_cells are neighboring at this line. in delete_children,
 // this is not accounted for (for n_cells>5) and the child lines are deleted,
@@ -90,7 +87,7 @@ check()
   // write grid to file
   GridOut go;
   go.set_flags(GridOutFlags::Ucd(true));
-  go.write_ucd(tria, logfile);
+  go.write_ucd(tria, deallog.get_file_stream());
   // coarsen the first cell again
   cell = tria.begin_active(1);
   for (unsigned int c = 0; c < 8; ++c)
@@ -100,14 +97,14 @@ check()
     }
   tria.execute_coarsening_and_refinement();
 
-  go.write_ucd(tria, logfile);
+  go.write_ucd(tria, deallog.get_file_stream());
 }
 
 
 int
 main()
 {
-  deallog.attach(logfile);
+  initlog();
   check();
   return 0;
 }

diff --git a/tests/grid/maximal_cell_diameter.cc b/tests/grid/maximal_cell_diameter.cc
index 30a884b7cd8cdffb3a188c0605e4270d8d85a4c0..105a3f92beb4de0503524c165b14f3e01e61a8ec 100644 (file)
--- a/tests/grid/maximal_cell_diameter.cc
+++ b/tests/grid/maximal_cell_diameter.cc
@@ -22,12 +22,6 @@
 
 #include "../tests.h"
 
-
-
-std::ofstream logfile("output");
-
-
-
 template <int dim>
 void
 test1()
@@ -74,8 +68,8 @@ test1()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(4);
-  deallog.attach(logfile);
 
   test1<1>();
   test1<2>();

diff --git a/tests/grid/measure_et_al.cc b/tests/grid/measure_et_al.cc
index 33e3c5d4dcdb8decff4bc3a4f5d45fe945c32fe6..48f4fa4717f1c757e109b5ca4af90a85843c5b6b 100644 (file)
--- a/tests/grid/measure_et_al.cc
+++ b/tests/grid/measure_et_al.cc
@@ -105,9 +105,8 @@ test()
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(PRECISION);
-  deallog.attach(logfile);
 
   test<2>();
   test<3>();

diff --git a/tests/grid/measure_et_al_02.cc b/tests/grid/measure_et_al_02.cc
index 14c5253f1e94e97a5a55f659fe0d9867c67922e6..8d8a85a2cf1a20f08b97041b19368f37bf60b735 100644 (file)
--- a/tests/grid/measure_et_al_02.cc
+++ b/tests/grid/measure_et_al_02.cc
@@ -118,9 +118,8 @@ test()
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(PRECISION);
-  deallog.attach(logfile);
 
   test<2>();
   test<3>();

diff --git a/tests/grid/measure_of_3d_face_01.cc b/tests/grid/measure_of_3d_face_01.cc
index 54b7dafa1811304c8012a5783146ae7ae85e9ff8..baf94425cf5f8a561b431edb48c907e12814f93a 100644 (file)
--- a/tests/grid/measure_of_3d_face_01.cc
+++ b/tests/grid/measure_of_3d_face_01.cc
@@ -102,9 +102,8 @@ test()
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(5);
-  deallog.attach(logfile);
 
   // run the tests but continue when finding an exception: we will try
   // out a distorted cell for which TriaAccessor::measure() will error

diff --git a/tests/grid/merge_triangulations_01.cc b/tests/grid/merge_triangulations_01.cc
index fec0733ec4429c8ae013e8bfaf87ba77bb3036de..bf64e43797b82f87a0c1a3c6da20b8aec99db35c 100644 (file)
--- a/tests/grid/merge_triangulations_01.cc
+++ b/tests/grid/merge_triangulations_01.cc
@@ -25,10 +25,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
-
-
 // testcase=0:
 // create two cubes; translate them so that no vertices overlap
 //
@@ -71,7 +67,7 @@ test(const int testcase)
   // now merge triangulations
   GridGenerator::merge_triangulations(tria_1, tria_2, tria_3);
 
-  GridOut().write_gnuplot(tria_3, logfile);
+  GridOut().write_gnuplot(tria_3, deallog.get_file_stream());
 
   deallog << "     Total number of cells        = " << tria_3.n_cells()
           << std::endl
@@ -83,9 +79,8 @@ test(const int testcase)
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   for (unsigned int t = 0; t < 3; ++t)
     {

diff --git a/tests/grid/merge_triangulations_02.cc b/tests/grid/merge_triangulations_02.cc
index b8c8ccf585ab8df500921047fee30b302e2c9ddd..5acf6f075ca43413021a02a280be232b8ab9a2ef 100644 (file)
--- a/tests/grid/merge_triangulations_02.cc
+++ b/tests/grid/merge_triangulations_02.cc
@@ -29,8 +29,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
 template <int dim>
 void
 mesh_info(const Triangulation<dim> &tria)
@@ -99,9 +97,8 @@ make_grid()
 int
 main()
 {
-  deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
+  initlog();
+  deallog.get_file_stream() << std::setprecision(2);
 
   make_grid();
 }

diff --git a/tests/grid/merge_triangulations_03.cc b/tests/grid/merge_triangulations_03.cc
index a7f639617b99b2a8aeff8e7aadb6ddf9f488ed8f..80857d9911e14de7dd497538a814fdce1ce9fb2d 100644 (file)
--- a/tests/grid/merge_triangulations_03.cc
+++ b/tests/grid/merge_triangulations_03.cc
@@ -35,9 +35,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 flatten_triangulation(Triangulation<dim> &tria_in, Triangulation<dim> &tria_out)
@@ -163,9 +160,8 @@ test()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   test();
 

diff --git a/tests/grid/mesh_3d_22.cc b/tests/grid/mesh_3d_22.cc
index 62480dfc1aa7d2793236d0812cf3449b2595c5a7..3e181b016f36a76bf9abc7172be8941f00ea11d9 100644 (file)
--- a/tests/grid/mesh_3d_22.cc
+++ b/tests/grid/mesh_3d_22.cc
@@ -119,8 +119,7 @@ test(Triangulation<dim> &triangulation)
 int
 main()
 {
-  std::ofstream logfile("output");
-  deallog.attach(logfile);
+  initlog();
 
   Triangulation<3> triangulation;
   GridIn<3>        grid_in;

diff --git a/tests/grid/mesh_3d_23.cc b/tests/grid/mesh_3d_23.cc
index edd08c5035a3f56668fb034b2a955236e7718b0a..32d6b689dc08ab2c4955eb036c06f25c1c49c24d 100644 (file)
--- a/tests/grid/mesh_3d_23.cc
+++ b/tests/grid/mesh_3d_23.cc
@@ -51,8 +51,7 @@
 int
 main()
 {
-  std::ofstream logfile("output");
-  deallog.attach(logfile);
+  initlog();
 
   Triangulation<3> triangulation;
   GridIn<3>        grid_in;

diff --git a/tests/grid/mesh_3d_24.cc b/tests/grid/mesh_3d_24.cc
index e2b80b58809adc81073d78c041d1e04fca484010..e444bbfff05e31864f0cae7b56e66507697bce8e 100644 (file)
--- a/tests/grid/mesh_3d_24.cc
+++ b/tests/grid/mesh_3d_24.cc
@@ -53,8 +53,7 @@
 int
 main()
 {
-  std::ofstream logfile("output");
-  deallog.attach(logfile);
+  initlog();
 
   Triangulation<3> triangulation;
   GridIn<3>        grid_in;

diff --git a/tests/grid/mesh_3d_25.cc b/tests/grid/mesh_3d_25.cc
index 07e50bb80e86ead2ebf0dc68a98d0cf5a12a8275..c3d2b16b5330af620ffc2df20ef3232d6b4a5194 100644 (file)
--- a/tests/grid/mesh_3d_25.cc
+++ b/tests/grid/mesh_3d_25.cc
@@ -115,9 +115,7 @@ test(Triangulation<dim> &triangulation)
 int
 main()
 {
-  std::ofstream logfile("output");
-  deallog.attach(logfile);
-
+  initlog();
   Triangulation<3> triangulation;
 
   create_two_cubes_rotation(triangulation, 1);

diff --git a/tests/grid/mesh_3d_26.cc b/tests/grid/mesh_3d_26.cc
index 649da576ffcf21b5849f3dc8f0ee9a1dcc6ae192..d3fdfb9b39c919898583d166d4ea00cc5dac54da 100644 (file)
--- a/tests/grid/mesh_3d_26.cc
+++ b/tests/grid/mesh_3d_26.cc
@@ -117,9 +117,7 @@ test(Triangulation<dim> &triangulation)
 int
 main()
 {
-  std::ofstream logfile("output");
-  deallog.attach(logfile);
-
+  initlog();
   Triangulation<3> triangulation;
   GridGenerator::hyper_ball(triangulation);
   triangulation.reset_manifold(0);

diff --git a/tests/grid/minimal_cell_diameter.cc b/tests/grid/minimal_cell_diameter.cc
index d5608d7335b1e97c69f48812adfe03cf23294f8c..57654caf24f441d8c01e86114a60093ad51ff8bf 100644 (file)
--- a/tests/grid/minimal_cell_diameter.cc
+++ b/tests/grid/minimal_cell_diameter.cc
@@ -22,12 +22,6 @@
 
 #include "../tests.h"
 
-
-
-std::ofstream logfile("output");
-
-
-
 template <int dim>
 void
 test1()
@@ -69,8 +63,8 @@ test1()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(4);
-  deallog.attach(logfile);
 
   test1<1>();
   test1<2>();

diff --git a/tests/grid/normal_vector_01.cc b/tests/grid/normal_vector_01.cc
index b3118201c8596e684826504a141b4e049d03c40a..977b84b5f02ee1abb19bd6f557235c9bf9db368e 100644 (file)
--- a/tests/grid/normal_vector_01.cc
+++ b/tests/grid/normal_vector_01.cc
@@ -59,10 +59,9 @@ create_triangulation(const unsigned int case_no, Triangulation<3> &tria)
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(3);
   deallog << std::fixed;
-  deallog.attach(logfile);
 
   Triangulation<3>               tria;
   FlatManifold<3>                boundary;

diff --git a/tests/grid/normal_vector_01_2d.cc b/tests/grid/normal_vector_01_2d.cc
index 809a4993e0df0ab4ef4ece8de1cf02d817a4901e..79ec860520414c5da6510c97207775782ab1c5ad 100644 (file)
--- a/tests/grid/normal_vector_01_2d.cc
+++ b/tests/grid/normal_vector_01_2d.cc
@@ -59,10 +59,9 @@ create_triangulation(const unsigned int case_no, Triangulation<2> &tria)
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(3);
   deallog << std::fixed;
-  deallog.attach(logfile);
 
   Triangulation<2>               tria;
   FlatManifold<2>                boundary;

diff --git a/tests/grid/normal_vector_02.cc b/tests/grid/normal_vector_02.cc
index 2366cb87c48a3dcc3458a9bb7bd403193a31669e..5978613f90e3aa1b614e9cb483090b427435451a 100644 (file)
--- a/tests/grid/normal_vector_02.cc
+++ b/tests/grid/normal_vector_02.cc
@@ -30,10 +30,9 @@
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(3);
   deallog << std::fixed;
-  deallog.attach(logfile);
 
   SphericalManifold<3> boundary(Point<3>(1, 0, 0));
 

diff --git a/tests/grid/normal_vector_02_2d.cc b/tests/grid/normal_vector_02_2d.cc
index fa8322767e06dba61b806069067b1e4d0491d22a..d782e9add3407a618b1063c257246f121c0e366a 100644 (file)
--- a/tests/grid/normal_vector_02_2d.cc
+++ b/tests/grid/normal_vector_02_2d.cc
@@ -30,10 +30,9 @@
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(3);
   deallog << std::fixed;
-  deallog.attach(logfile);
 
   SphericalManifold<2> boundary(Point<2>(1, 0));
 

diff --git a/tests/grid/normal_vector_03.cc b/tests/grid/normal_vector_03.cc
index f4f46a172665fbb2b80bbaf8f707896e9af583ab..67556849fdd3a59bf136fffb9e3fd6b6f20555b1 100644 (file)
--- a/tests/grid/normal_vector_03.cc
+++ b/tests/grid/normal_vector_03.cc
@@ -61,10 +61,9 @@ create_triangulation(const unsigned int case_no, Triangulation<3> &tria)
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(3);
   deallog << std::fixed;
-  deallog.attach(logfile);
 
   FE_Q<2> linear_interpolator(1);
 

diff --git a/tests/grid/normal_vector_03_2d.cc b/tests/grid/normal_vector_03_2d.cc
index 8ede3dc75e7e1b83066035fbf33b7b8015729484..9fa12eccb6a8a8b489f512de90d9aacdbb34394b 100644 (file)
--- a/tests/grid/normal_vector_03_2d.cc
+++ b/tests/grid/normal_vector_03_2d.cc
@@ -61,10 +61,9 @@ create_triangulation(const unsigned int case_no, Triangulation<2> &tria)
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(3);
   deallog << std::fixed;
-  deallog.attach(logfile);
 
   FE_Q<1> linear_interpolator(1);
 

diff --git a/tests/grid/normals_at_vertices_01.cc b/tests/grid/normals_at_vertices_01.cc
index a3dc8308fd1caa085970d2af527c614f46b2fa6a..1bc99f5b08b7bf3e50315fca5f3ab899a7f4dec1 100644 (file)
--- a/tests/grid/normals_at_vertices_01.cc
+++ b/tests/grid/normals_at_vertices_01.cc
@@ -58,10 +58,9 @@ create_triangulation(const unsigned int case_no, Triangulation<3> &tria)
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(3);
   deallog << std::fixed;
-  deallog.attach(logfile);
 
   Triangulation<3>               tria;
   FlatManifold<3>                boundary;

diff --git a/tests/grid/normals_at_vertices_02.cc b/tests/grid/normals_at_vertices_02.cc
index 98129cc09f46916636fe755ca3c5bdd91eb4f119..fd05cd03cdd054902268c85629236e60c06c7513 100644 (file)
--- a/tests/grid/normals_at_vertices_02.cc
+++ b/tests/grid/normals_at_vertices_02.cc
@@ -30,10 +30,9 @@
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(3);
   deallog << std::fixed;
-  deallog.attach(logfile);
 
   SphericalManifold<3> boundary(Point<3>(1, 0, 0));
 

diff --git a/tests/grid/number_cache_01.cc b/tests/grid/number_cache_01.cc
index 9c7aca9b0e965736a48f12e916031e3c365451c5..f23717342a64b48d213b6358cd2d44b6c0c5601f 100644 (file)
--- a/tests/grid/number_cache_01.cc
+++ b/tests/grid/number_cache_01.cc
@@ -32,10 +32,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
-
-
 template <int dim>
 void
 output(const Triangulation<dim> &tria)
@@ -97,8 +93,8 @@ test()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  deallog.attach(logfile);
 
   test<1>();
   test<2>();

diff --git a/tests/grid/number_cache_02.cc b/tests/grid/number_cache_02.cc
index 24dec982820925e806d463788337aa1643b88794..8fce78e76a0e75b05ec4f7457db1437b8964daa8 100644 (file)
--- a/tests/grid/number_cache_02.cc
+++ b/tests/grid/number_cache_02.cc
@@ -32,10 +32,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
-
-
 template <int dim>
 void
 output(const Triangulation<dim> &tria)
@@ -118,8 +114,8 @@ test(const char *filename)
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  deallog.attach(logfile);
 
   test<2>(SOURCE_DIR "/grid_in/2d.xda");
 

diff --git a/tests/grid/number_cache_03.cc b/tests/grid/number_cache_03.cc
index b00dd412cbbafc9c1743dd6008e02c41cfb3715c..fe5a2ee2136c89a7cb9fc88b7aeec284119a7fbe 100644 (file)
--- a/tests/grid/number_cache_03.cc
+++ b/tests/grid/number_cache_03.cc
@@ -37,10 +37,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
-
-
 template <int dim>
 void
 output(const Triangulation<dim> &tria)
@@ -106,8 +102,8 @@ test()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  deallog.attach(logfile);
 
   test<1>();
   test<2>();

diff --git a/tests/grid/recursively_set_material_id.cc b/tests/grid/recursively_set_material_id.cc
index ddaa2b8fe46d1d2562e89f55e6f11b72a26bced3..6147fc1db1a19eee4a556d9da9367573d462c034 100644 (file)
--- a/tests/grid/recursively_set_material_id.cc
+++ b/tests/grid/recursively_set_material_id.cc
@@ -96,11 +96,9 @@ test()
 int
 main()
 {
-  std::ofstream logfile("output");
+  initlog();
   deallog << std::setprecision(2);
 
-  deallog.attach(logfile);
-
   test<1>();
   test<2>();
   test<3>();

diff --git a/tests/grid/refinement_listener_02.cc b/tests/grid/refinement_listener_02.cc
index 1addbef46b0ca0e21174a250f5d9dcd513b0d5dd..ae73bcba13b974e699514781a8cbc99324339762 100644 (file)
--- a/tests/grid/refinement_listener_02.cc
+++ b/tests/grid/refinement_listener_02.cc
@@ -25,10 +25,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
-
-
 template <int dim, int spacedim>
 void
 pre_refinement_notification(const std::string &                 prefix,
@@ -128,9 +124,8 @@ test()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   test<1>();
   test<2>();

diff --git a/tests/grid/refinement_listener_03.cc b/tests/grid/refinement_listener_03.cc
index c79fa3994d93ac52e8ce1a34c7ce98e6983d5946..80fbfa5e45c3274a231f8d180c3e4f3b8ecf018b 100644 (file)
--- a/tests/grid/refinement_listener_03.cc
+++ b/tests/grid/refinement_listener_03.cc
@@ -23,11 +23,6 @@
 
 #include "../tests.h"
 
-
-std::ofstream logfile("output");
-
-
-
 template <int dim, int spacedim>
 void
 pre_refinement_notification(const std::string &                 prefix,
@@ -150,9 +145,8 @@ test()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   test<1>();
   test<2>();

diff --git a/tests/grid/subdomain_ids.cc b/tests/grid/subdomain_ids.cc
index b9f8cc7cde46c67f97c02fa9f9cefdd158669bab..b85ca63c8ca98a76ba72e80180bcda8e6260fc1a 100644 (file)
--- a/tests/grid/subdomain_ids.cc
+++ b/tests/grid/subdomain_ids.cc
@@ -33,9 +33,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
-
 DeclException2(ExcNumberMismatch,
                int,
                int,
@@ -178,8 +175,8 @@ test()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(4);
-  deallog.attach(logfile);
 
   test<1>();
   test<2>();

diff --git a/tests/grid/subdomain_on_refinement.cc b/tests/grid/subdomain_on_refinement.cc
index 845be6573ea057be8c8fd9f030106353d714fb50..ba9f886964f16e1bb7b1da80d59da3abd56a50a8 100644 (file)
--- a/tests/grid/subdomain_on_refinement.cc
+++ b/tests/grid/subdomain_on_refinement.cc
@@ -33,9 +33,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
-
 DeclException2(ExcNumberMismatch,
                int,
                int,
@@ -62,8 +59,8 @@ test()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(4);
-  deallog.attach(logfile);
 
   test<1>();
   test<2>();

diff --git a/tests/grid/tria_iterator_with_one_header.cc b/tests/grid/tria_iterator_with_one_header.cc
index 6cf5a15f78d1a078d21ab5d1d9883f38d04919a8..d008b5d42cdff76c10d92f28d5d15f493cf293dc 100644 (file)
--- a/tests/grid/tria_iterator_with_one_header.cc
+++ b/tests/grid/tria_iterator_with_one_header.cc
@@ -27,9 +27,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
-
 template <int dim>
 void
 test()
@@ -43,9 +40,8 @@ test()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(4);
-  logfile << std::setprecision(4);
-  deallog.attach(logfile);
 
   test<1>();
   test<2>();

diff --git a/tests/grid/tria_last.cc b/tests/grid/tria_last.cc
index 57641e64f2c5cf553643676dd9739bdeed054f6f..ac1e143df04b5a933a0af3db3ca726f202e2a85a 100644 (file)
--- a/tests/grid/tria_last.cc
+++ b/tests/grid/tria_last.cc
@@ -27,11 +27,6 @@
 
 #include "../tests.h"
 
-
-std::ofstream logfile("output");
-
-
-
 template <int dim>
 void
 test()
@@ -57,9 +52,8 @@ test()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   test<1>();
   test<2>();

diff --git a/tests/grid/twisted_parallelepiped_02.cc b/tests/grid/twisted_parallelepiped_02.cc
index 37af4d3cf3e0a621ce607f2ac9dd7c66064f3ce8..b23c046fc8c83e9ac5e062e1c7e30811addc6d48 100644 (file)
--- a/tests/grid/twisted_parallelepiped_02.cc
+++ b/tests/grid/twisted_parallelepiped_02.cc
@@ -34,7 +34,7 @@
 
 template <int dim>
 void
-check_parallelepiped(std::ofstream &logfile)
+check_parallelepiped()
 {
   // Data structure defining dim coordinates that make up a
   // parallelepiped.
@@ -73,7 +73,7 @@ check_parallelepiped(std::ofstream &logfile)
     }
   catch (ExceptionBase &exc)
     {
-      logfile << exc.get_exc_name() << std::endl;
+      deallog.get_file_stream() << exc.get_exc_name() << std::endl;
     }
 }
 
@@ -81,10 +81,10 @@ int
 main()
 {
   deal_II_exceptions::disable_abort_on_exception();
-  std::ofstream logfile("output");
+  initlog();
 
-  check_parallelepiped<1>(logfile);
-  check_parallelepiped<2>(logfile);
-  check_parallelepiped<3>(logfile);
-  logfile << "OK" << std::endl;
+  check_parallelepiped<1>();
+  check_parallelepiped<2>();
+  check_parallelepiped<3>();
+  deallog.get_file_stream() << "OK" << std::endl;
 }

diff --git a/tests/grid/twisted_parallelepiped_02.release.output b/tests/grid/twisted_parallelepiped_02.release.output
index b4453d8f8fe45d69b3f951ecacfb4dedb6547e19..0d659f65f9d703918f4b326a67b29b7e75ea5a70 100644 (file)
--- a/tests/grid/twisted_parallelepiped_02.release.output
+++ b/tests/grid/twisted_parallelepiped_02.release.output
@@ -1,3 +1,4 @@
+
 ExcGridHasInvalidCell(cell_no)
 ExcGridHasInvalidCell(cell_no)
 ExcGridHasInvalidCell(cell_no)

diff --git a/tests/grid/union_triangulation.cc b/tests/grid/union_triangulation.cc
index 711a77f1207baed286abadcaae31be7aca90bf27..1b994ff71089c8b00be6e30d5da2d63cff7baf9d 100644 (file)
--- a/tests/grid/union_triangulation.cc
+++ b/tests/grid/union_triangulation.cc
@@ -24,11 +24,6 @@
 
 #include "../tests.h"
 
-
-std::ofstream logfile("output");
-
-
-
 template <int dim>
 void
 test()
@@ -57,7 +52,7 @@ test()
 
   GridGenerator::create_union_triangulation(tria_1, tria_2, tria_3);
 
-  GridOut().write_gnuplot(tria_3, logfile);
+  GridOut().write_gnuplot(tria_3, deallog.get_file_stream());
 
   deallog << "     Total number of cells        = " << tria_3.n_cells()
           << std::endl
@@ -69,9 +64,8 @@ test()
 int
 main()
 {
+  initlog();
   deallog << std::setprecision(2);
-  logfile << std::setprecision(2);
-  deallog.attach(logfile);
 
   test<1>();
   test<2>();