From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Thu, 22 Aug 2013 01:58:56 +0000 (+0000)
Subject: Port tests/multigrid
X-Git-Tag: v8.1.0~570^2~436
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deccb6446d3ded5e1e3b80ed594728e1dc604a19;p=dealii.git

Port tests/multigrid

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30399 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 41594f786d..596c326afa 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -70,7 +70,6 @@ MESSAGE(STATUS "Proceed to test definitions")
 #$(if $(USE_CONTRIB_PETSC:no=),    petsc,) \
 #$(if $(USE_CONTRIB_SLEPC:no=),    slepc,) \
 #$(if $(USE_CONTRIB_TRILINOS:no=), trilinos,) \
-#$(if $(USE_CONTRIB_HSL:no=),      hsl,) \
 #$(if $(USE_CONTRIB_LAPACK:no=),   lapack,)
 
 #a-framework
@@ -81,23 +80,23 @@ ADD_SUBDIRECTORY(base)
 #bits
 ADD_SUBDIRECTORY(codim_one)
 #deal.II
-#distributed_grids
 #fail
 #fe
-#gla
 #grid
 #hp
-#hsl
 #integrators
 #lac
 #lapack
 #lib
 #matrix_free
 #mesh_converter
+ADD_SUBDIRECTORY(multigrid)
+#serialization
+
+#distributed_grids
+#gla
 #mpi
-#multigrid
 #petsc
-#serialization
 #slepc
 #trilinos
 
diff --git a/tests/multigrid/CMakeLists.txt b/tests/multigrid/CMakeLists.txt
new file mode 100644
index 0000000000..0efb828f2c
--- /dev/null
+++ b/tests/multigrid/CMakeLists.txt
@@ -0,0 +1 @@
+DEAL_II_PICKUP_TESTS()
diff --git a/tests/multigrid/boundary_01.cc b/tests/multigrid/boundary_01.cc
index 2dad33fa8a..b8548755fb 100644
--- a/tests/multigrid/boundary_01.cc
+++ b/tests/multigrid/boundary_01.cc
@@ -92,7 +92,7 @@ void check()
 
 int main()
 {
-  std::ofstream logfile("boundary_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/boundary_01/cmp/generic b/tests/multigrid/boundary_01.output
similarity index 100%
rename from tests/multigrid/boundary_01/cmp/generic
rename to tests/multigrid/boundary_01.output
diff --git a/tests/multigrid/count_01.cc b/tests/multigrid/count_01.cc
index 26207cba69..eb93433e2b 100644
--- a/tests/multigrid/count_01.cc
+++ b/tests/multigrid/count_01.cc
@@ -110,7 +110,7 @@ void check()
 
 int main()
 {
-  std::ofstream logfile("count_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/count_01/cmp/generic b/tests/multigrid/count_01.output
similarity index 100%
rename from tests/multigrid/count_01/cmp/generic
rename to tests/multigrid/count_01.output
diff --git a/tests/multigrid/cycles.cc b/tests/multigrid/cycles.cc
index d8a2c7f66f..068b752093 100644
--- a/tests/multigrid/cycles.cc
+++ b/tests/multigrid/cycles.cc
@@ -91,7 +91,7 @@ void test_cycles(unsigned int minlevel, unsigned int maxlevel)
 
 int main()
 {
-  std::ofstream logfile("cycles/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/multigrid/cycles/cmp/generic b/tests/multigrid/cycles.output
similarity index 100%
rename from tests/multigrid/cycles/cmp/generic
rename to tests/multigrid/cycles.output
diff --git a/tests/multigrid/dof_01/cmp/generic b/tests/multigrid/dof_01.output
similarity index 100%
rename from tests/multigrid/dof_01/cmp/generic
rename to tests/multigrid/dof_01.output
diff --git a/tests/multigrid/dof_02/cmp/generic b/tests/multigrid/dof_02.output
similarity index 100%
rename from tests/multigrid/dof_02/cmp/generic
rename to tests/multigrid/dof_02.output
diff --git a/tests/multigrid/dof_03/cmp/generic b/tests/multigrid/dof_03.output
similarity index 100%
rename from tests/multigrid/dof_03/cmp/generic
rename to tests/multigrid/dof_03.output
diff --git a/tests/multigrid/mg_output.cc b/tests/multigrid/mg_output.cc
index 4d8ca154f0..39c5e72e06 100644
--- a/tests/multigrid/mg_output.cc
+++ b/tests/multigrid/mg_output.cc
@@ -283,7 +283,7 @@ void check_simple(const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("mg_output/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/mg_output/cmp/generic b/tests/multigrid/mg_output.output
similarity index 100%
rename from tests/multigrid/mg_output/cmp/generic
rename to tests/multigrid/mg_output.output
diff --git a/tests/multigrid/mg_renumbered_01.cc b/tests/multigrid/mg_renumbered_01.cc
index ffa4202d32..d860d13c06 100644
--- a/tests/multigrid/mg_renumbered_01.cc
+++ b/tests/multigrid/mg_renumbered_01.cc
@@ -479,7 +479,7 @@ void LaplaceProblem<dim>::run ()
 
 int main ()
 {
-  std::ofstream logfile("mg_renumbered_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/mg_renumbered_01/cmp/generic b/tests/multigrid/mg_renumbered_01.output
similarity index 100%
rename from tests/multigrid/mg_renumbered_01/cmp/generic
rename to tests/multigrid/mg_renumbered_01.output
diff --git a/tests/multigrid/mg_renumbered_02.cc b/tests/multigrid/mg_renumbered_02.cc
index 2b5fa393ae..fda0e5a06b 100644
--- a/tests/multigrid/mg_renumbered_02.cc
+++ b/tests/multigrid/mg_renumbered_02.cc
@@ -357,7 +357,7 @@ void LaplaceProblem<dim>::run ()
 
 int main ()
 {
-  std::ofstream logfile("mg_renumbered_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/multigrid/mg_renumbered_02/cmp/generic b/tests/multigrid/mg_renumbered_02.output
similarity index 100%
rename from tests/multigrid/mg_renumbered_02/cmp/generic
rename to tests/multigrid/mg_renumbered_02.output
diff --git a/tests/multigrid/mg_renumbered_03.cc b/tests/multigrid/mg_renumbered_03.cc
index eec6455845..9bcb1b87fc 100644
--- a/tests/multigrid/mg_renumbered_03.cc
+++ b/tests/multigrid/mg_renumbered_03.cc
@@ -425,7 +425,7 @@ void LaplaceProblem<dim>::run ()
 
 int main ()
 {
-  std::ofstream logfile("mg_renumbered_03/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/multigrid/mg_renumbered_03/cmp/generic b/tests/multigrid/mg_renumbered_03.output
similarity index 100%
rename from tests/multigrid/mg_renumbered_03/cmp/generic
rename to tests/multigrid/mg_renumbered_03.output
diff --git a/tests/multigrid/renumbering_01/cmp/generic b/tests/multigrid/renumbering_01.output
similarity index 100%
rename from tests/multigrid/renumbering_01/cmp/generic
rename to tests/multigrid/renumbering_01.output
diff --git a/tests/multigrid/renumbering_02/cmp/generic b/tests/multigrid/renumbering_02.output
similarity index 100%
rename from tests/multigrid/renumbering_02/cmp/generic
rename to tests/multigrid/renumbering_02.output
diff --git a/tests/multigrid/renumbering_03/cmp/generic b/tests/multigrid/renumbering_03.output
similarity index 100%
rename from tests/multigrid/renumbering_03/cmp/generic
rename to tests/multigrid/renumbering_03.output
diff --git a/tests/multigrid/smoother_block.cc b/tests/multigrid/smoother_block.cc
index d9d86cab4d..a18bd10b33 100644
--- a/tests/multigrid/smoother_block.cc
+++ b/tests/multigrid/smoother_block.cc
@@ -210,7 +210,7 @@ void check()
 
 int main()
 {
-  std::ofstream logfile("smoother_block/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/smoother_block/cmp/generic b/tests/multigrid/smoother_block.output
similarity index 100%
rename from tests/multigrid/smoother_block/cmp/generic
rename to tests/multigrid/smoother_block.output
diff --git a/tests/multigrid/step-16.cc b/tests/multigrid/step-16.cc
index 1d881e62b5..0064dc0a62 100644
--- a/tests/multigrid/step-16.cc
+++ b/tests/multigrid/step-16.cc
@@ -913,7 +913,7 @@ void LaplaceProblem<dim>::run ()
 // in step-6:
 int main ()
 {
-  std::ofstream logfile("step-16/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/step-16/cmp/generic b/tests/multigrid/step-16.output
similarity index 100%
rename from tests/multigrid/step-16/cmp/generic
rename to tests/multigrid/step-16.output
diff --git a/tests/multigrid/step-39-02.cc b/tests/multigrid/step-39-02.cc
index c3c1279750..32d858e58d 100644
--- a/tests/multigrid/step-39-02.cc
+++ b/tests/multigrid/step-39-02.cc
@@ -658,7 +658,7 @@ namespace Step39
   void InteriorPenaltyProblem<dim>::output_results (const unsigned int cycle) const
   {
     char *fn = new char[100];
-    sprintf(fn, "step-39-02/sol-%02d", cycle);
+    sprintf(fn, "sol-%02d", cycle);
 
     std::string filename(fn);
     filename += ".gnuplot";
diff --git a/tests/multigrid/step-39-02/cmp/generic b/tests/multigrid/step-39-02.output
similarity index 100%
rename from tests/multigrid/step-39-02/cmp/generic
rename to tests/multigrid/step-39-02.output
diff --git a/tests/multigrid/step-39-03.cc b/tests/multigrid/step-39-03.cc
index 5128306168..87e33b7662 100644
--- a/tests/multigrid/step-39-03.cc
+++ b/tests/multigrid/step-39-03.cc
@@ -659,7 +659,7 @@ namespace Step39
   void InteriorPenaltyProblem<dim>::output_results (const unsigned int cycle) const
   {
     char *fn = new char[100];
-    sprintf(fn, "step-39-03/sol-%02d", cycle);
+    sprintf(fn, "sol-%02d", cycle);
 
     std::string filename(fn);
     filename += ".gnuplot";
diff --git a/tests/multigrid/step-39-03/cmp/generic b/tests/multigrid/step-39-03.output
similarity index 100%
rename from tests/multigrid/step-39-03/cmp/generic
rename to tests/multigrid/step-39-03.output
diff --git a/tests/multigrid/step-39.cc b/tests/multigrid/step-39.cc
index b0964a4a17..9b6ae03518 100644
--- a/tests/multigrid/step-39.cc
+++ b/tests/multigrid/step-39.cc
@@ -647,7 +647,7 @@ namespace Step39
   void InteriorPenaltyProblem<dim>::output_results (const unsigned int cycle) const
   {
     char *fn = new char[100];
-    sprintf(fn, "step-39/sol-%02d", cycle);
+    sprintf(fn, "sol-%02d", cycle);
 
     std::string filename(fn);
     filename += ".gnuplot";
diff --git a/tests/multigrid/step-39/cmp/generic b/tests/multigrid/step-39.output
similarity index 100%
rename from tests/multigrid/step-39/cmp/generic
rename to tests/multigrid/step-39.output
diff --git a/tests/multigrid/transfer_01.cc b/tests/multigrid/transfer_01.cc
index 5927575dfb..e7878b8716 100644
--- a/tests/multigrid/transfer_01.cc
+++ b/tests/multigrid/transfer_01.cc
@@ -139,7 +139,7 @@ void check_simple(const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(6);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_01/cmp/generic b/tests/multigrid/transfer_01.output
similarity index 100%
rename from tests/multigrid/transfer_01/cmp/generic
rename to tests/multigrid/transfer_01.output
diff --git a/tests/multigrid/transfer_02.cc b/tests/multigrid/transfer_02.cc
index 8f3f824e49..80bd42ee5a 100644
--- a/tests/multigrid/transfer_02.cc
+++ b/tests/multigrid/transfer_02.cc
@@ -169,7 +169,7 @@ void check_simple(const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_02/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(6);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_02/cmp/generic b/tests/multigrid/transfer_02.output
similarity index 100%
rename from tests/multigrid/transfer_02/cmp/generic
rename to tests/multigrid/transfer_02.output
diff --git a/tests/multigrid/transfer_03.cc b/tests/multigrid/transfer_03.cc
index c5279c3066..c7c0f700a5 100644
--- a/tests/multigrid/transfer_03.cc
+++ b/tests/multigrid/transfer_03.cc
@@ -244,7 +244,7 @@ void check_simple(const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_03/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_03/cmp/generic b/tests/multigrid/transfer_03.output
similarity index 100%
rename from tests/multigrid/transfer_03/cmp/generic
rename to tests/multigrid/transfer_03.output
diff --git a/tests/multigrid/transfer_block.cc b/tests/multigrid/transfer_block.cc
index 0edda40480..355b9e136a 100644
--- a/tests/multigrid/transfer_block.cc
+++ b/tests/multigrid/transfer_block.cc
@@ -199,7 +199,7 @@ void check_block(const FiniteElement<dim> &fe,
 
 int main()
 {
-  std::ofstream logfile("transfer_block/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_block/cmp/generic b/tests/multigrid/transfer_block.output
similarity index 100%
rename from tests/multigrid/transfer_block/cmp/generic
rename to tests/multigrid/transfer_block.output
diff --git a/tests/multigrid/transfer_block_select.cc b/tests/multigrid/transfer_block_select.cc
index a2597b6787..d0a9b2f64a 100644
--- a/tests/multigrid/transfer_block_select.cc
+++ b/tests/multigrid/transfer_block_select.cc
@@ -170,7 +170,7 @@ void check_select(const FiniteElement<dim> &fe, unsigned int selected)
 
 int main()
 {
-  std::ofstream logfile("transfer_block_select/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_block_select/cmp/generic b/tests/multigrid/transfer_block_select.output
similarity index 100%
rename from tests/multigrid/transfer_block_select/cmp/generic
rename to tests/multigrid/transfer_block_select.output
diff --git a/tests/multigrid/transfer_compare_01.cc b/tests/multigrid/transfer_compare_01.cc
index 14065a0777..65fbe1cf23 100644
--- a/tests/multigrid/transfer_compare_01.cc
+++ b/tests/multigrid/transfer_compare_01.cc
@@ -275,7 +275,7 @@ void check_block(const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_compare_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_compare_01/cmp/generic b/tests/multigrid/transfer_compare_01.output
similarity index 100%
rename from tests/multigrid/transfer_compare_01/cmp/generic
rename to tests/multigrid/transfer_compare_01.output
diff --git a/tests/multigrid/transfer_prebuilt_01/cmp/generic b/tests/multigrid/transfer_prebuilt_01.output
similarity index 100%
rename from tests/multigrid/transfer_prebuilt_01/cmp/generic
rename to tests/multigrid/transfer_prebuilt_01.output
diff --git a/tests/multigrid/transfer_prebuilt_02/cmp/generic b/tests/multigrid/transfer_prebuilt_02.output
similarity index 100%
rename from tests/multigrid/transfer_prebuilt_02/cmp/generic
rename to tests/multigrid/transfer_prebuilt_02.output
diff --git a/tests/multigrid/transfer_prebuilt_03/cmp/generic b/tests/multigrid/transfer_prebuilt_03.output
similarity index 100%
rename from tests/multigrid/transfer_prebuilt_03/cmp/generic
rename to tests/multigrid/transfer_prebuilt_03.output
diff --git a/tests/multigrid/transfer_select.cc b/tests/multigrid/transfer_select.cc
index c7ffc4ff87..65cd16252e 100644
--- a/tests/multigrid/transfer_select.cc
+++ b/tests/multigrid/transfer_select.cc
@@ -125,7 +125,7 @@ void check_select(const FiniteElement<dim> &fe,
 
 int main()
 {
-  std::ofstream logfile("transfer_select/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_select/cmp/generic b/tests/multigrid/transfer_select.output
similarity index 100%
rename from tests/multigrid/transfer_select/cmp/generic
rename to tests/multigrid/transfer_select.output
diff --git a/tests/multigrid/transfer_system_01.cc b/tests/multigrid/transfer_system_01.cc
index 7d150ae66b..99d248db34 100644
--- a/tests/multigrid/transfer_system_01.cc
+++ b/tests/multigrid/transfer_system_01.cc
@@ -125,7 +125,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_01/cmp/generic b/tests/multigrid/transfer_system_01.output
similarity index 100%
rename from tests/multigrid/transfer_system_01/cmp/generic
rename to tests/multigrid/transfer_system_01.output
diff --git a/tests/multigrid/transfer_system_02.cc b/tests/multigrid/transfer_system_02.cc
index 6568622c84..a7663cd577 100644
--- a/tests/multigrid/transfer_system_02.cc
+++ b/tests/multigrid/transfer_system_02.cc
@@ -133,7 +133,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_02/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_02/cmp/generic b/tests/multigrid/transfer_system_02.output
similarity index 100%
rename from tests/multigrid/transfer_system_02/cmp/generic
rename to tests/multigrid/transfer_system_02.output
diff --git a/tests/multigrid/transfer_system_03.cc b/tests/multigrid/transfer_system_03.cc
index 411f2a58c6..92bf2711ab 100644
--- a/tests/multigrid/transfer_system_03.cc
+++ b/tests/multigrid/transfer_system_03.cc
@@ -134,7 +134,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_03/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_03/cmp/generic b/tests/multigrid/transfer_system_03.output
similarity index 100%
rename from tests/multigrid/transfer_system_03/cmp/generic
rename to tests/multigrid/transfer_system_03.output
diff --git a/tests/multigrid/transfer_system_04.cc b/tests/multigrid/transfer_system_04.cc
index 1234a8d9f1..0b5a3b093d 100644
--- a/tests/multigrid/transfer_system_04.cc
+++ b/tests/multigrid/transfer_system_04.cc
@@ -134,7 +134,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_04/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_04/cmp/generic b/tests/multigrid/transfer_system_04.output
similarity index 100%
rename from tests/multigrid/transfer_system_04/cmp/generic
rename to tests/multigrid/transfer_system_04.output
diff --git a/tests/multigrid/transfer_system_05.cc b/tests/multigrid/transfer_system_05.cc
index b81f3d88ec..731f7a5c86 100644
--- a/tests/multigrid/transfer_system_05.cc
+++ b/tests/multigrid/transfer_system_05.cc
@@ -124,7 +124,7 @@ void check (const FiniteElement<dim> &fe, const unsigned int selected_block)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_05/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_05/cmp/generic b/tests/multigrid/transfer_system_05.output
similarity index 100%
rename from tests/multigrid/transfer_system_05/cmp/generic
rename to tests/multigrid/transfer_system_05.output
diff --git a/tests/multigrid/transfer_system_adaptive_01.cc b/tests/multigrid/transfer_system_adaptive_01.cc
index 6b9e1c1a70..9a24dc704c 100644
--- a/tests/multigrid/transfer_system_adaptive_01.cc
+++ b/tests/multigrid/transfer_system_adaptive_01.cc
@@ -161,7 +161,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_adaptive_01/cmp/generic b/tests/multigrid/transfer_system_adaptive_01.output
similarity index 100%
rename from tests/multigrid/transfer_system_adaptive_01/cmp/generic
rename to tests/multigrid/transfer_system_adaptive_01.output
diff --git a/tests/multigrid/transfer_system_adaptive_02.cc b/tests/multigrid/transfer_system_adaptive_02.cc
index 379ece2695..ede711bea3 100644
--- a/tests/multigrid/transfer_system_adaptive_02.cc
+++ b/tests/multigrid/transfer_system_adaptive_02.cc
@@ -170,7 +170,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_02/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_adaptive_02/cmp/generic b/tests/multigrid/transfer_system_adaptive_02.output
similarity index 100%
rename from tests/multigrid/transfer_system_adaptive_02/cmp/generic
rename to tests/multigrid/transfer_system_adaptive_02.output
diff --git a/tests/multigrid/transfer_system_adaptive_03.cc b/tests/multigrid/transfer_system_adaptive_03.cc
index ed1243f81e..88d93399ac 100644
--- a/tests/multigrid/transfer_system_adaptive_03.cc
+++ b/tests/multigrid/transfer_system_adaptive_03.cc
@@ -163,7 +163,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_03/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_adaptive_03/cmp/generic b/tests/multigrid/transfer_system_adaptive_03.output
similarity index 100%
rename from tests/multigrid/transfer_system_adaptive_03/cmp/generic
rename to tests/multigrid/transfer_system_adaptive_03.output
diff --git a/tests/multigrid/transfer_system_adaptive_04.cc b/tests/multigrid/transfer_system_adaptive_04.cc
index 9936f01ce9..950e8d8f0b 100644
--- a/tests/multigrid/transfer_system_adaptive_04.cc
+++ b/tests/multigrid/transfer_system_adaptive_04.cc
@@ -172,7 +172,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_04/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_adaptive_04/cmp/generic b/tests/multigrid/transfer_system_adaptive_04.output
similarity index 100%
rename from tests/multigrid/transfer_system_adaptive_04/cmp/generic
rename to tests/multigrid/transfer_system_adaptive_04.output
diff --git a/tests/multigrid/transfer_system_adaptive_05.cc b/tests/multigrid/transfer_system_adaptive_05.cc
index eecee130a3..853713dda7 100644
--- a/tests/multigrid/transfer_system_adaptive_05.cc
+++ b/tests/multigrid/transfer_system_adaptive_05.cc
@@ -167,7 +167,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_05/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_adaptive_05/cmp/generic b/tests/multigrid/transfer_system_adaptive_05.output
similarity index 100%
rename from tests/multigrid/transfer_system_adaptive_05/cmp/generic
rename to tests/multigrid/transfer_system_adaptive_05.output
diff --git a/tests/multigrid/transfer_system_adaptive_06.cc b/tests/multigrid/transfer_system_adaptive_06.cc
index 11b281a4b5..8059004152 100644
--- a/tests/multigrid/transfer_system_adaptive_06.cc
+++ b/tests/multigrid/transfer_system_adaptive_06.cc
@@ -174,7 +174,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_06/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_adaptive_06/cmp/generic b/tests/multigrid/transfer_system_adaptive_06.output
similarity index 100%
rename from tests/multigrid/transfer_system_adaptive_06/cmp/generic
rename to tests/multigrid/transfer_system_adaptive_06.output
diff --git a/tests/multigrid/transfer_system_adaptive_07.cc b/tests/multigrid/transfer_system_adaptive_07.cc
index ffbeb5729f..aa1cd97312 100644
--- a/tests/multigrid/transfer_system_adaptive_07.cc
+++ b/tests/multigrid/transfer_system_adaptive_07.cc
@@ -174,7 +174,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_07/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_adaptive_07/cmp/generic b/tests/multigrid/transfer_system_adaptive_07.output
similarity index 100%
rename from tests/multigrid/transfer_system_adaptive_07/cmp/generic
rename to tests/multigrid/transfer_system_adaptive_07.output
diff --git a/tests/multigrid/transfer_system_adaptive_08.cc b/tests/multigrid/transfer_system_adaptive_08.cc
index 37e5c3be8a..29f30addc3 100644
--- a/tests/multigrid/transfer_system_adaptive_08.cc
+++ b/tests/multigrid/transfer_system_adaptive_08.cc
@@ -181,7 +181,7 @@ void check (const FiniteElement<dim> &fe)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_08/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_adaptive_08/cmp/generic b/tests/multigrid/transfer_system_adaptive_08.output
similarity index 100%
rename from tests/multigrid/transfer_system_adaptive_08/cmp/generic
rename to tests/multigrid/transfer_system_adaptive_08.output
diff --git a/tests/multigrid/transfer_system_adaptive_09.cc b/tests/multigrid/transfer_system_adaptive_09.cc
index 7534013357..3d25ca3bee 100644
--- a/tests/multigrid/transfer_system_adaptive_09.cc
+++ b/tests/multigrid/transfer_system_adaptive_09.cc
@@ -167,7 +167,7 @@ void check (const FiniteElement<dim> &fe, const unsigned int selected_block)
 
 int main()
 {
-  std::ofstream logfile("transfer_system_adaptive_09/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/multigrid/transfer_system_adaptive_09/cmp/generic b/tests/multigrid/transfer_system_adaptive_09.output
similarity index 100%
rename from tests/multigrid/transfer_system_adaptive_09/cmp/generic
rename to tests/multigrid/transfer_system_adaptive_09.output