cleanup a few data_out_base_vtu tests

diff --git a/tests/base/data_out_base_vtu.cc b/tests/base/data_out_base_vtu.cc
index 10e8b27c0221685e9b3414bb97df9f68873ce354..510ac6ab230b83543c07591c19d62ac6fc72e205 100644 (file)
--- a/tests/base/data_out_base_vtu.cc
+++ b/tests/base/data_out_base_vtu.cc
@@ -24,10 +24,6 @@
 
 // Output data on repetitions of the unit hypercube
 
-// define this as 1 to get output into a separate file for each testcase
-#define SEPARATE_FILES 0
-
-
 template <int dim, int spacedim>
 void check(DataOutBase::VtkFlags flags,
            std::ostream &out)
@@ -52,24 +48,11 @@ void check(DataOutBase::VtkFlags flags,
 template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
-#if SEPARATE_FILES == 0
-  std::ostream &out = log;
-#endif
-
-  char name[100];
   DataOutBase::VtkFlags flags;
-  if (true)
-    {
-      sprintf(name, "%d%d.vtu", dim, spacedim);
-#if SEPARATE_FILES==1
-      std::ofstream out(name);
-#else
-      out << "==============================\n"
-          << name
-          << "\n==============================\n";
-#endif
-      check<dim,spacedim>(flags, out);
-    }
+  log << "==============================" << std::endl
+      << dim << spacedim << ".vtu" << std::endl
+      << "==============================" << std::endl;
+  check<dim,spacedim>(flags, log);
 }
 
 int main()

diff --git a/tests/base/data_out_base_vtu_cycle.cc b/tests/base/data_out_base_vtu_cycle.cc
index bcdea18f59da57fd9adb234949e1995eb6606afe..8751403558772ef2f3e0bbc293efe6582fdae138 100644 (file)
--- a/tests/base/data_out_base_vtu_cycle.cc
+++ b/tests/base/data_out_base_vtu_cycle.cc
@@ -26,10 +26,6 @@
 
 // Output data on repetitions of the unit hypercube
 
-// define this as 1 to get output into a separate file for each testcase
-#define SEPARATE_FILES 0
-
-
 template <int dim, int spacedim>
 void check(DataOutBase::VtkFlags flags,
            std::ostream &out)
@@ -54,27 +50,15 @@ void check(DataOutBase::VtkFlags flags,
 template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
-#if SEPARATE_FILES == 0
-  std::ostream &out = log;
-#endif
-
-  char name[100];
   DataOutBase::VtkFlags flags;
 
   flags.cycle = 42;
 
-  if (true)
-    {
-      sprintf(name, "%d%d.vtu", dim, spacedim);
-#if SEPARATE_FILES==1
-      std::ofstream out(name);
-#else
-      out << "==============================\n"
-          << name
-          << "\n==============================\n";
-#endif
-      check<dim,spacedim>(flags, out);
-    }
+  log << "=============================="   << std::endl
+      << dim << spacedim << ".vtu"          << std::endl
+      << "=============================="   << std::endl;
+  check<dim,spacedim>(flags, log);
+
 }
 
 int main()

diff --git a/tests/base/data_out_base_vtu_time.cc b/tests/base/data_out_base_vtu_time.cc
index 5e82d1224bb96c3b09048c374ad6a16b0f55cb73..5de2535bd6f7a0fb58f8aee1ab64e668586302aa 100644 (file)
--- a/tests/base/data_out_base_vtu_time.cc
+++ b/tests/base/data_out_base_vtu_time.cc
@@ -26,10 +26,6 @@
 
 // Output data on repetitions of the unit hypercube
 
-// define this as 1 to get output into a separate file for each testcase
-#define SEPARATE_FILES 0
-
-
 template <int dim, int spacedim>
 void check(DataOutBase::VtkFlags flags,
            std::ostream &out)
@@ -54,27 +50,14 @@ void check(DataOutBase::VtkFlags flags,
 template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
-#if SEPARATE_FILES == 0
-  std::ostream &out = log;
-#endif
-
-  char name[100];
   DataOutBase::VtkFlags flags;
 
   flags.time = numbers::PI;
 
-  if (true)
-    {
-      sprintf(name, "%d%d.vtu", dim, spacedim);
-#if SEPARATE_FILES==1
-      std::ofstream out(name);
-#else
-      out << "==============================\n"
-          << name
-          << "\n==============================\n";
-#endif
-      check<dim,spacedim>(flags, out);
-    }
+  log << "==============================" << std::endl
+      << dim << spacedim << ".vtu"        << std::endl
+      << "==============================" << std::endl;
+  check<dim,spacedim>(flags, log);
 }
 
 int main()

diff --git a/tests/base/data_out_base_vtu_time_and_cycle.cc b/tests/base/data_out_base_vtu_time_and_cycle.cc
index 8b3e67f7c7d1082586d0ee292f4a17e44e1f2738..b3620c5d74b08f55935fbaf213584dede41630ee 100644 (file)
--- a/tests/base/data_out_base_vtu_time_and_cycle.cc
+++ b/tests/base/data_out_base_vtu_time_and_cycle.cc
@@ -27,10 +27,6 @@
 
 // Output data on repetitions of the unit hypercube
 
-// define this as 1 to get output into a separate file for each testcase
-#define SEPARATE_FILES 0
-
-
 template <int dim, int spacedim>
 void check(DataOutBase::VtkFlags flags,
            std::ostream &out)
@@ -55,28 +51,15 @@ void check(DataOutBase::VtkFlags flags,
 template <int dim, int spacedim>
 void check_all(std::ostream &log)
 {
-#if SEPARATE_FILES == 0
-  std::ostream &out = log;
-#endif
-
-  char name[100];
   DataOutBase::VtkFlags flags;
 
   flags.time = numbers::PI;
   flags.cycle = 42;
 
-  if (true)
-    {
-      sprintf(name, "%d%d.vtu", dim, spacedim);
-#if SEPARATE_FILES==1
-      std::ofstream out(name);
-#else
-      out << "==============================\n"
-          << name
-          << "\n==============================\n";
-#endif
-      check<dim,spacedim>(flags, out);
-    }
+  log << "==============================" << std::endl
+      << dim << spacedim << ".vtu"        << std::endl
+      << "==============================" << std::endl;
+  check<dim,spacedim>(flags, log);
 }
 
 int main()