From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Fri, 13 Sep 2013 13:50:11 +0000 (+0000)
Subject: A lot of cleanup
X-Git-Tag: v8.1.0~570^2~356
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13d1c92f1c78ceb48a76149927dc586cbc943daa;p=dealii.git

A lot of cleanup

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

diff --git a/tests/TODO b/tests/TODO
index 1159385c02..1e3f7513ba 100644
--- a/tests/TODO
+++ b/tests/TODO
@@ -3,3 +3,17 @@ Issues:
  - p4est's vtk write out may be with zlib support - independent of how
    deal.II is actually configured. With this, a lot of tests under
    distributed_grids fail.
+
+ - Depending on the version of boost, a version number in the serialization
+   output changes and all tests just.. fail
+
+ - Mesh converter tests?
+
+ - Benchmark tests?
+
+ - What about the files in
+
+   ./base/data_out_base_dx
+   ./base/data_out_base_povray
+
+ - Relocate all meshes in ./deal.II/*/ to ./deal.II/grids
diff --git a/tests/bits/distorted_cells_03/2d b/tests/bits/distorted_cells_03/2d
deleted file mode 100644
index 1a53889d21..0000000000
--- a/tests/bits/distorted_cells_03/2d
+++ /dev/null
@@ -1,6 +0,0 @@
-4 1 0 0 0 
-1 0 0 0
-2 1 0 0 
-3 0 1 0
-4 1 1 0
-1 0 quad 1 2 3 4
diff --git a/tests/bits/distorted_cells_03/3d b/tests/bits/distorted_cells_03/3d
deleted file mode 100644
index dd37099c80..0000000000
--- a/tests/bits/distorted_cells_03/3d
+++ /dev/null
@@ -1,10 +0,0 @@
-8 1 0 0 0
-1 0 0 0
-2 1 0 0 
-3 0 1 0
-4 1 1 0
-5 0 0 1
-6 1 0 1 
-7 0 1 1
-8 1 1 1
-1 0 hex 1 2 3 4 5 6 7 8
diff --git a/tests/bits/distorted_cells_04/2d b/tests/bits/distorted_cells_04/2d
deleted file mode 100644
index 1a53889d21..0000000000
--- a/tests/bits/distorted_cells_04/2d
+++ /dev/null
@@ -1,6 +0,0 @@
-4 1 0 0 0 
-1 0 0 0
-2 1 0 0 
-3 0 1 0
-4 1 1 0
-1 0 quad 1 2 3 4
diff --git a/tests/bits/distorted_cells_04/3d b/tests/bits/distorted_cells_04/3d
deleted file mode 100644
index dd37099c80..0000000000
--- a/tests/bits/distorted_cells_04/3d
+++ /dev/null
@@ -1,10 +0,0 @@
-8 1 0 0 0
-1 0 0 0
-2 1 0 0 
-3 0 1 0
-4 1 1 0
-5 0 0 1
-6 1 0 1 
-7 0 1 1
-8 1 1 1
-1 0 hex 1 2 3 4 5 6 7 8
diff --git a/tests/bits/distorted_cells_05/2d b/tests/bits/distorted_cells_05/2d
deleted file mode 100644
index 1a53889d21..0000000000
--- a/tests/bits/distorted_cells_05/2d
+++ /dev/null
@@ -1,6 +0,0 @@
-4 1 0 0 0 
-1 0 0 0
-2 1 0 0 
-3 0 1 0
-4 1 1 0
-1 0 quad 1 2 3 4
diff --git a/tests/bits/distorted_cells_05/3d b/tests/bits/distorted_cells_05/3d
deleted file mode 100644
index dd37099c80..0000000000
--- a/tests/bits/distorted_cells_05/3d
+++ /dev/null
@@ -1,10 +0,0 @@
-8 1 0 0 0
-1 0 0 0
-2 1 0 0 
-3 0 1 0
-4 1 1 0
-5 0 0 1
-6 1 0 1 
-7 0 1 1
-8 1 1 1
-1 0 hex 1 2 3 4 5 6 7 8
diff --git a/tests/bits/distorted_cells_06/2d b/tests/bits/distorted_cells_06/2d
deleted file mode 100644
index 1a53889d21..0000000000
--- a/tests/bits/distorted_cells_06/2d
+++ /dev/null
@@ -1,6 +0,0 @@
-4 1 0 0 0 
-1 0 0 0
-2 1 0 0 
-3 0 1 0
-4 1 1 0
-1 0 quad 1 2 3 4
diff --git a/tests/bits/distorted_cells_06/3d b/tests/bits/distorted_cells_06/3d
deleted file mode 100644
index dd37099c80..0000000000
--- a/tests/bits/distorted_cells_06/3d
+++ /dev/null
@@ -1,10 +0,0 @@
-8 1 0 0 0
-1 0 0 0
-2 1 0 0 
-3 0 1 0
-4 1 1 0
-5 0 0 1
-6 1 0 1 
-7 0 1 1
-8 1 1 1
-1 0 hex 1 2 3 4 5 6 7 8
diff --git a/tests/bits/find_cell_10.cc b/tests/bits/find_cell_10.cc
index a223625e17..3242e608b9 100644
--- a/tests/bits/find_cell_10.cc
+++ b/tests/bits/find_cell_10.cc
@@ -81,7 +81,7 @@ void test()
 
   GridIn<2> grid_in1;
   grid_in1.attach_triangulation (triangulation);
-  std::ifstream input_file1(SOURCE_DIR "/find_cell_10/mesh.msh");
+  std::ifstream input_file1(SOURCE_DIR "/grids/find_cell_10.msh");
   grid_in1.read_msh(input_file1);
 
   dof_handler.distribute_dofs (fe);
diff --git a/tests/bits/find_cell_6.cc b/tests/bits/find_cell_6.cc
index ca0fa5cf4b..6e058dbcf2 100644
--- a/tests/bits/find_cell_6.cc
+++ b/tests/bits/find_cell_6.cc
@@ -48,7 +48,7 @@ void check2 ()
   Triangulation<3> tria;
   GridIn<3> gridIn;
   gridIn.attach_triangulation (tria);
-  std::ifstream inputFile(SOURCE_DIR "/find_cell_6/grid.inp");
+  std::ifstream inputFile(SOURCE_DIR "/grids/grid.inp");
   gridIn.read_ucd (inputFile);
 
   Point<3> p2(304.767,-57.0113,254.766);
diff --git a/tests/bits/find_cell_7.cc b/tests/bits/find_cell_7.cc
index a1c47aa7af..235a4535a1 100644
--- a/tests/bits/find_cell_7.cc
+++ b/tests/bits/find_cell_7.cc
@@ -56,7 +56,7 @@ void check2 ()
   Triangulation<3> tria;
   GridIn<3> gridIn;
   gridIn.attach_triangulation (tria);
-  std::ifstream inputFile(SOURCE_DIR "/find_cell_7/grid.inp");
+  std::ifstream inputFile(SOURCE_DIR "/grids/grid.inp");
   gridIn.read_ucd (inputFile);
 
   Point<3> p2(304.767,-57.0113,254.766);
diff --git a/tests/bits/find_cell_7/grid.inp b/tests/bits/find_cell_7/grid.inp
deleted file mode 100644
index 7874765f7d..0000000000
--- a/tests/bits/find_cell_7/grid.inp
+++ /dev/null
@@ -1,146 +0,0 @@
-# sixD mesh generator, version 1 
-# omit element on surface: 1
-# nodes:    x: 6   y: 4   z: 4   total: 96
-# elements: x: 5   y: 3   z: 3   total: 44
-# size: first corner: (-1000;-500;0)    second corner: (1150;650;650)
-96 44 0 0 0
-1 -1000 -500 0
-2 -500 -500 0
-3 -6.10352e-05 -500 0
-4 150 -500 0
-5 650 -500 0
-6 1150 -500 0
-7 -1000 0 0
-8 -500 0 0
-9 -6.10352e-05 0 0
-10 150 0 0
-11 650 0 0
-12 1150 0 0
-13 -1000 150 0
-14 -500 150 0
-15 -6.10352e-05 150 0
-16 150 150 0
-17 650 150 0
-18 1150 150 0
-19 -1000 650 0
-20 -500 650 0
-21 -6.10352e-05 650 0
-22 150 650 0
-23 650 650 0
-24 1150 650 0
-25 -1000 -500 150
-26 -500 -500 150
-27 -6.10352e-05 -500 150
-28 150 -500 150
-29 650 -500 150
-30 1150 -500 150
-31 -1000 0 150
-32 -500 0 150
-33 -6.10352e-05 0 150
-34 150 0 150
-35 650 0 150
-36 1150 0 150
-37 -1000 150 150
-38 -500 150 150
-39 -6.10352e-05 150 150
-40 150 150 150
-41 650 150 150
-42 1150 150 150
-43 -1000 650 150
-44 -500 650 150
-45 -6.10352e-05 650 150
-46 150 650 150
-47 650 650 150
-48 1150 650 150
-49 -1000 -500 400
-50 -500 -500 400
-51 -6.10352e-05 -500 400
-52 150 -500 400
-53 650 -500 400
-54 1150 -500 400
-55 -1000 0 400
-56 -500 0 400
-57 -6.10352e-05 0 400
-58 150 0 400
-59 650 0 400
-60 1150 0 400
-61 -1000 150 400
-62 -500 150 400
-63 -6.10352e-05 150 400
-64 150 150 400
-65 650 150 400
-66 1150 150 400
-67 -1000 650 400
-68 -500 650 400
-69 -6.10352e-05 650 400
-70 150 650 400
-71 650 650 400
-72 1150 650 400
-73 -1000 -500 650
-74 -500 -500 650
-75 -6.10352e-05 -500 650
-76 150 -500 650
-77 650 -500 650
-78 1150 -500 650
-79 -1000 0 650
-80 -500 0 650
-81 -6.10352e-05 0 650
-82 150 0 650
-83 650 0 650
-84 1150 0 650
-85 -1000 150 650
-86 -500 150 650
-87 -6.10352e-05 150 650
-88 150 150 650
-89 650 150 650
-90 1150 150 650
-91 -1000 650 650
-92 -500 650 650
-93 -6.10352e-05 650 650
-94 150 650 650
-95 650 650 650
-96 1150 650 650
-1 0 hex 1 2 8 7 25 26 32 31
-2 0 hex 2 3 9 8 26 27 33 32
-3 0 hex 3 4 10 9 27 28 34 33
-4 0 hex 4 5 11 10 28 29 35 34
-5 0 hex 5 6 12 11 29 30 36 35
-6 0 hex 7 8 14 13 31 32 38 37
-7 0 hex 8 9 15 14 32 33 39 38
-8 0 hex 10 11 17 16 34 35 41 40
-9 0 hex 11 12 18 17 35 36 42 41
-10 0 hex 13 14 20 19 37 38 44 43
-11 0 hex 14 15 21 20 38 39 45 44
-12 0 hex 15 16 22 21 39 40 46 45
-13 0 hex 16 17 23 22 40 41 47 46
-14 0 hex 17 18 24 23 41 42 48 47
-15 0 hex 25 26 32 31 49 50 56 55
-16 0 hex 26 27 33 32 50 51 57 56
-17 0 hex 27 28 34 33 51 52 58 57
-18 0 hex 28 29 35 34 52 53 59 58
-19 0 hex 29 30 36 35 53 54 60 59
-20 0 hex 31 32 38 37 55 56 62 61
-21 0 hex 32 33 39 38 56 57 63 62
-22 0 hex 33 34 40 39 57 58 64 63
-23 0 hex 34 35 41 40 58 59 65 64
-24 0 hex 35 36 42 41 59 60 66 65
-25 0 hex 37 38 44 43 61 62 68 67
-26 0 hex 38 39 45 44 62 63 69 68
-27 0 hex 39 40 46 45 63 64 70 69
-28 0 hex 40 41 47 46 64 65 71 70
-29 0 hex 41 42 48 47 65 66 72 71
-30 0 hex 49 50 56 55 73 74 80 79
-31 0 hex 50 51 57 56 74 75 81 80
-32 0 hex 51 52 58 57 75 76 82 81
-33 0 hex 52 53 59 58 76 77 83 82
-34 0 hex 53 54 60 59 77 78 84 83
-35 0 hex 55 56 62 61 79 80 86 85
-36 0 hex 56 57 63 62 80 81 87 86
-37 0 hex 57 58 64 63 81 82 88 87
-38 0 hex 58 59 65 64 82 83 89 88
-39 0 hex 59 60 66 65 83 84 90 89
-40 0 hex 61 62 68 67 85 86 92 91
-41 0 hex 62 63 69 68 86 87 93 92
-42 0 hex 63 64 70 69 87 88 94 93
-43 0 hex 64 65 71 70 88 89 95 94
-44 0 hex 65 66 72 71 89 90 96 95
diff --git a/tests/bits/step-5/circle-grid.inp b/tests/bits/grids/circle-grid.inp
similarity index 100%
rename from tests/bits/step-5/circle-grid.inp
rename to tests/bits/grids/circle-grid.inp
diff --git a/tests/bits/distorted_cells_02/2d b/tests/bits/grids/distorted_mesh.2d
similarity index 100%
rename from tests/bits/distorted_cells_02/2d
rename to tests/bits/grids/distorted_mesh.2d
diff --git a/tests/bits/distorted_cells_02/3d b/tests/bits/grids/distorted_mesh.3d
similarity index 100%
rename from tests/bits/distorted_cells_02/3d
rename to tests/bits/grids/distorted_mesh.3d
diff --git a/tests/bits/find_cell_10/mesh.msh b/tests/bits/grids/find_cell_10.msh
similarity index 100%
rename from tests/bits/find_cell_10/mesh.msh
rename to tests/bits/grids/find_cell_10.msh
diff --git a/tests/bits/find_cell_6/grid.inp b/tests/bits/grids/grid.inp
similarity index 100%
rename from tests/bits/find_cell_6/grid.inp
rename to tests/bits/grids/grid.inp
diff --git a/tests/bits/mesh_3d_22/mesh.msh b/tests/bits/grids/mesh.msh
similarity index 100%
rename from tests/bits/mesh_3d_22/mesh.msh
rename to tests/bits/grids/mesh.msh
diff --git a/tests/bits/mesh_3d_22.cc b/tests/bits/mesh_3d_22.cc
index bbd649cfac..e1c66b177e 100644
--- a/tests/bits/mesh_3d_22.cc
+++ b/tests/bits/mesh_3d_22.cc
@@ -131,7 +131,7 @@ int main ()
   Triangulation<3> triangulation;
   GridIn<3> grid_in;
   grid_in.attach_triangulation(triangulation);
-  std::ifstream inputStream(SOURCE_DIR "/mesh_3d_22/mesh.msh");
+  std::ifstream inputStream(SOURCE_DIR "/grids/mesh.msh");
   grid_in.read_msh (inputStream);
   test<3>(triangulation);
 }
diff --git a/tests/bits/mesh_3d_23.cc b/tests/bits/mesh_3d_23.cc
index e5ced3def3..d1113e2531 100644
--- a/tests/bits/mesh_3d_23.cc
+++ b/tests/bits/mesh_3d_23.cc
@@ -67,7 +67,7 @@ int main ()
   Triangulation<3> triangulation;
   GridIn<3> grid_in;
   grid_in.attach_triangulation(triangulation);
-  std::ifstream inputStream(SOURCE_DIR "/mesh_3d_22/mesh.msh");
+  std::ifstream inputStream(SOURCE_DIR "/grids/mesh.msh");
   grid_in.read_msh (inputStream);
 
   MappingQ<3> mapping(3);
diff --git a/tests/bits/mesh_3d_23/mesh.msh b/tests/bits/mesh_3d_23/mesh.msh
deleted file mode 100644
index 1720c7a637..0000000000
--- a/tests/bits/mesh_3d_23/mesh.msh
+++ /dev/null
@@ -1,20 +0,0 @@
-$NOD
-12
-1 1.5 0.2 0
-2 1.5 0.4 0
-3 1.5 0.6 0
-4 2.0 0.2 0
-5 2.0 0.4 0
-6 2.0 0.6 0
-7 1.5 0.2 0.205
-8 1.5 0.4 0.205
-9 1.5 0.6 0.205
-10 2.0 0.2 0.205
-11 2.0 0.4 0.205
-12 2.0 0.6 0.205
-$ENDNOD
-$ELM
-2
-1 5 30 1 8 5 6 3 2 11 12 9 8
-2 5 30 1 8 5 2 1 4 11 8 7 10
-$ENDELM
diff --git a/tests/bits/mesh_3d_24.cc b/tests/bits/mesh_3d_24.cc
index a4f0f3b5e1..3399e7020b 100644
--- a/tests/bits/mesh_3d_24.cc
+++ b/tests/bits/mesh_3d_24.cc
@@ -69,7 +69,7 @@ int main ()
   Triangulation<3> triangulation;
   GridIn<3> grid_in;
   grid_in.attach_triangulation(triangulation);
-  std::ifstream inputStream(SOURCE_DIR "/mesh_3d_22/mesh.msh");
+  std::ifstream inputStream(SOURCE_DIR "/grids/mesh.msh");
   grid_in.read_msh (inputStream);
 
   MappingQ<3> mapping(3);
diff --git a/tests/bits/mesh_3d_24/mesh.msh b/tests/bits/mesh_3d_24/mesh.msh
deleted file mode 100644
index 1720c7a637..0000000000
--- a/tests/bits/mesh_3d_24/mesh.msh
+++ /dev/null
@@ -1,20 +0,0 @@
-$NOD
-12
-1 1.5 0.2 0
-2 1.5 0.4 0
-3 1.5 0.6 0
-4 2.0 0.2 0
-5 2.0 0.4 0
-6 2.0 0.6 0
-7 1.5 0.2 0.205
-8 1.5 0.4 0.205
-9 1.5 0.6 0.205
-10 2.0 0.2 0.205
-11 2.0 0.4 0.205
-12 2.0 0.6 0.205
-$ENDNOD
-$ELM
-2
-1 5 30 1 8 5 6 3 2 11 12 9 8
-2 5 30 1 8 5 2 1 4 11 8 7 10
-$ENDELM
diff --git a/tests/bits/mesh_3d_25/mesh.msh b/tests/bits/mesh_3d_25/mesh.msh
deleted file mode 100644
index 1720c7a637..0000000000
--- a/tests/bits/mesh_3d_25/mesh.msh
+++ /dev/null
@@ -1,20 +0,0 @@
-$NOD
-12
-1 1.5 0.2 0
-2 1.5 0.4 0
-3 1.5 0.6 0
-4 2.0 0.2 0
-5 2.0 0.4 0
-6 2.0 0.6 0
-7 1.5 0.2 0.205
-8 1.5 0.4 0.205
-9 1.5 0.6 0.205
-10 2.0 0.2 0.205
-11 2.0 0.4 0.205
-12 2.0 0.6 0.205
-$ENDNOD
-$ELM
-2
-1 5 30 1 8 5 6 3 2 11 12 9 8
-2 5 30 1 8 5 2 1 4 11 8 7 10
-$ENDELM
diff --git a/tests/bits/mesh_3d_26/mesh.msh b/tests/bits/mesh_3d_26/mesh.msh
deleted file mode 100644
index 1720c7a637..0000000000
--- a/tests/bits/mesh_3d_26/mesh.msh
+++ /dev/null
@@ -1,20 +0,0 @@
-$NOD
-12
-1 1.5 0.2 0
-2 1.5 0.4 0
-3 1.5 0.6 0
-4 2.0 0.2 0
-5 2.0 0.4 0
-6 2.0 0.6 0
-7 1.5 0.2 0.205
-8 1.5 0.4 0.205
-9 1.5 0.6 0.205
-10 2.0 0.2 0.205
-11 2.0 0.4 0.205
-12 2.0 0.6 0.205
-$ENDNOD
-$ELM
-2
-1 5 30 1 8 5 6 3 2 11 12 9 8
-2 5 30 1 8 5 2 1 4 11 8 7 10
-$ENDELM
diff --git a/tests/bits/multiple_parameter_loop_01.cc b/tests/bits/multiple_parameter_loop_01.cc
index af46f6f612..2464e45ebe 100644
--- a/tests/bits/multiple_parameter_loop_01.cc
+++ b/tests/bits/multiple_parameter_loop_01.cc
@@ -74,7 +74,7 @@ void check ()
   HelperClass h;
 
   h.declare_parameters (prm);
-  prm.read_input (SOURCE_DIR "/multiple_parameter_loop_01/prm");
+  prm.read_input (SOURCE_DIR "/prm/multiple_parameter_loop_01.prm");
   prm.loop (h);
 }
 
diff --git a/tests/bits/multiple_parameter_loop_02.cc b/tests/bits/multiple_parameter_loop_02.cc
index cc373c3acf..23bf1b0fb1 100644
--- a/tests/bits/multiple_parameter_loop_02.cc
+++ b/tests/bits/multiple_parameter_loop_02.cc
@@ -86,7 +86,7 @@ int main ()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  check (SOURCE_DIR "/multiple_parameter_loop_02/prm");
+  check (SOURCE_DIR "/prm/multiple_parameter_loop_02.prm");
 
   return 0;
 }
diff --git a/tests/bits/parameter_handler_1.cc b/tests/bits/parameter_handler_1.cc
index 5ce477b014..f460fa03ae 100644
--- a/tests/bits/parameter_handler_1.cc
+++ b/tests/bits/parameter_handler_1.cc
@@ -43,7 +43,7 @@ int main ()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  check (SOURCE_DIR "/parameter_handler_1/prm");
+  check (SOURCE_DIR "/prm/parameter_handler_1.prm");
 
   return 0;
 }
diff --git a/tests/bits/parameter_handler_10.cc b/tests/bits/parameter_handler_10.cc
index b945b9f379..b23570c751 100644
--- a/tests/bits/parameter_handler_10.cc
+++ b/tests/bits/parameter_handler_10.cc
@@ -44,7 +44,7 @@ int main ()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  check (SOURCE_DIR "/parameter_handler_10/prm");
+  check (SOURCE_DIR "/prm/parameter_handler_10.prm");
 
   return 0;
 }
diff --git a/tests/bits/parameter_handler_11.cc b/tests/bits/parameter_handler_11.cc
index e5b30cd173..457cea0aaf 100644
--- a/tests/bits/parameter_handler_11.cc
+++ b/tests/bits/parameter_handler_11.cc
@@ -43,7 +43,7 @@ int main ()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  check (SOURCE_DIR "/parameter_handler_11/prm");
+  check (SOURCE_DIR "/prm/parameter_handler_11.prm");
 
   return 0;
 }
diff --git a/tests/bits/parameter_handler_13.cc b/tests/bits/parameter_handler_13.cc
index 0ea6ce5ca5..033aeeac35 100644
--- a/tests/bits/parameter_handler_13.cc
+++ b/tests/bits/parameter_handler_13.cc
@@ -45,7 +45,7 @@ int main ()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  check (SOURCE_DIR "/parameter_handler_13/prm");
+  check (SOURCE_DIR "/prm/parameter_handler_13.prm");
 
   return 0;
 }
diff --git a/tests/bits/parameter_handler_13a.cc b/tests/bits/parameter_handler_13a.cc
index e678c74a34..3d0e501316 100644
--- a/tests/bits/parameter_handler_13a.cc
+++ b/tests/bits/parameter_handler_13a.cc
@@ -45,7 +45,7 @@ int main ()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  check (SOURCE_DIR "/parameter_handler_13a/prm");
+  check (SOURCE_DIR "/prm/parameter_handler_13a.prm");
 
   return 0;
 }
diff --git a/tests/bits/parameter_handler_1_exception.cc b/tests/bits/parameter_handler_1_exception.cc
index 95b6fe0cc1..acf49e204e 100644
--- a/tests/bits/parameter_handler_1_exception.cc
+++ b/tests/bits/parameter_handler_1_exception.cc
@@ -52,7 +52,7 @@ int main ()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  check (SOURCE_DIR "/parameter_handler_1_exception/prm");
+  check (SOURCE_DIR "/prm/parameter_handler_1_exception.prm");
 
   return 0;
 }
diff --git a/tests/bits/parameter_handler_1a.cc b/tests/bits/parameter_handler_1a.cc
index f682ac5f4d..7c8f59f527 100644
--- a/tests/bits/parameter_handler_1a.cc
+++ b/tests/bits/parameter_handler_1a.cc
@@ -44,7 +44,7 @@ int main ()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  check (SOURCE_DIR "/parameter_handler_1a/prm");
+  check (SOURCE_DIR "/prm/parameter_handler_1a.prm");
 
   return 0;
 }
diff --git a/tests/bits/parameter_handler_2.cc b/tests/bits/parameter_handler_2.cc
index 1fc33f11bd..49d4aeb6ff 100644
--- a/tests/bits/parameter_handler_2.cc
+++ b/tests/bits/parameter_handler_2.cc
@@ -39,7 +39,7 @@ int main ()
                      Patterns::List(Patterns::Selection("a|b|c|d|e|f|g|h")));
   prm.leave_subsection ();
 
-  prm.read_input(SOURCE_DIR "/parameter_handler_2/prm");
+  prm.read_input(SOURCE_DIR "/prm/parameter_handler_2.prm");
 
   std::string list;
   prm.enter_subsection ("Testing");
diff --git a/tests/bits/parameter_handler_2_read_from_string.cc b/tests/bits/parameter_handler_2_read_from_string.cc
index 4da8ef64d0..3979afc9b2 100644
--- a/tests/bits/parameter_handler_2_read_from_string.cc
+++ b/tests/bits/parameter_handler_2_read_from_string.cc
@@ -39,7 +39,7 @@ int main ()
   prm.leave_subsection ();
 
   std::string input;
-  std::ifstream in(SOURCE_DIR "/parameter_handler_2_read_from_string/prm");
+  std::ifstream in(SOURCE_DIR "/prm/parameter_handler_2_read_from_string.prm");
   while (in)
     {
       std::string s;
diff --git a/tests/bits/parameter_handler_2_read_from_string/cmp/generic b/tests/bits/parameter_handler_2_read_from_string/cmp/generic
deleted file mode 100644
index 9eb091f67d..0000000000
--- a/tests/bits/parameter_handler_2_read_from_string/cmp/generic
+++ /dev/null
@@ -1,2 +0,0 @@
-
-DEAL::a, b, c
diff --git a/tests/bits/parameter_handler_3.cc b/tests/bits/parameter_handler_3.cc
index 3450af110b..82f40192be 100644
--- a/tests/bits/parameter_handler_3.cc
+++ b/tests/bits/parameter_handler_3.cc
@@ -50,7 +50,7 @@ int main ()
       prm.leave_subsection ();
 
       // read and then write parameters
-      prm.read_input(SOURCE_DIR "/parameter_handler_3/prm");
+      prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm");
       prm.print_parameters (logfile, ParameterHandler::Text);
     }
   catch (std::exception &exc)
diff --git a/tests/bits/parameter_handler_4.cc b/tests/bits/parameter_handler_4.cc
index 3852511b46..999783e959 100644
--- a/tests/bits/parameter_handler_4.cc
+++ b/tests/bits/parameter_handler_4.cc
@@ -53,7 +53,7 @@ int main ()
       // parameters. take same input file
       // as for parameter_handler_3, but
       // use different output format
-      prm.read_input(SOURCE_DIR "/parameter_handler_3/prm");
+      prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm");
       prm.print_parameters (logfile, ParameterHandler::LaTeX);
     }
   catch (std::exception &exc)
diff --git a/tests/bits/parameter_handler_4a.cc b/tests/bits/parameter_handler_4a.cc
index 1ec79e3acb..79ad6f7255 100644
--- a/tests/bits/parameter_handler_4a.cc
+++ b/tests/bits/parameter_handler_4a.cc
@@ -73,7 +73,7 @@ int main ()
       // parameters. take same input file
       // as for parameter_handler_3, but
       // use different output format
-      prm.read_input(SOURCE_DIR "/parameter_handler_3/prm");
+      prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm");
       prm.print_parameters (logfile, ParameterHandler::LaTeX);
     }
   catch (std::exception &exc)
diff --git a/tests/bits/parameter_handler_6.cc b/tests/bits/parameter_handler_6.cc
index 606e7b9617..823899b5ed 100644
--- a/tests/bits/parameter_handler_6.cc
+++ b/tests/bits/parameter_handler_6.cc
@@ -50,7 +50,7 @@ int main ()
                          "docs 3");
       prm.leave_subsection ();
 
-      prm.read_input(SOURCE_DIR "/parameter_handler_3/prm");
+      prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm");
 
       // now set some of the entries to
       // different values
diff --git a/tests/bits/parameter_handler_7.cc b/tests/bits/parameter_handler_7.cc
index 254117b23c..9512e68d2f 100644
--- a/tests/bits/parameter_handler_7.cc
+++ b/tests/bits/parameter_handler_7.cc
@@ -53,7 +53,7 @@ int main ()
       // parameters. take same input file
       // as for parameter_handler_3, but
       // use different output format
-      prm.read_input(SOURCE_DIR "/parameter_handler_3/prm");
+      prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm");
       prm.print_parameters (logfile, ParameterHandler::Description);
     }
   catch (std::exception &exc)
diff --git a/tests/bits/parameter_handler_8.cc b/tests/bits/parameter_handler_8.cc
index 11de979272..059e225b1c 100644
--- a/tests/bits/parameter_handler_8.cc
+++ b/tests/bits/parameter_handler_8.cc
@@ -73,7 +73,7 @@ int main ()
       // parameters. take same input file
       // as for parameter_handler_3, but
       // use different output format
-      prm.read_input(SOURCE_DIR "/parameter_handler_8/prm");
+      prm.read_input(SOURCE_DIR "/prm/parameter_handler_8.prm");
       prm.print_parameters (logfile, ParameterHandler::Text);
     }
   catch (std::exception &exc)
diff --git a/tests/bits/parameter_handler_9.cc b/tests/bits/parameter_handler_9.cc
index 841d2d6b82..90fefd5c0d 100644
--- a/tests/bits/parameter_handler_9.cc
+++ b/tests/bits/parameter_handler_9.cc
@@ -71,7 +71,7 @@ int main ()
       // parameters. take same input file
       // as for parameter_handler_3, but
       // use different output format
-      prm.read_input(SOURCE_DIR "/parameter_handler_8/prm");
+      prm.read_input(SOURCE_DIR "/prm/parameter_handler_8.prm");
       prm.log_parameters (deallog);
     }
   catch (std::exception &exc)
diff --git a/tests/bits/parameter_handler_read_xml.cc b/tests/bits/parameter_handler_read_xml.cc
index 7dac801066..83c51b02ef 100644
--- a/tests/bits/parameter_handler_read_xml.cc
+++ b/tests/bits/parameter_handler_read_xml.cc
@@ -76,7 +76,7 @@ int main ()
   prm.leave_subsection ();
 
   // read from XML
-  std::ifstream in (SOURCE_DIR "/parameter_handler_read_xml/prm");
+  std::ifstream in (SOURCE_DIR "/prm/parameter_handler_read_xml.prm");
   bool result = prm.read_input_from_xml (in);
   Assert (result == true, ExcInternalError());
 
diff --git a/tests/bits/multiple_parameter_loop_01/prm b/tests/bits/prm/multiple_parameter_loop_01.prm
similarity index 100%
rename from tests/bits/multiple_parameter_loop_01/prm
rename to tests/bits/prm/multiple_parameter_loop_01.prm
diff --git a/tests/bits/multiple_parameter_loop_02/prm b/tests/bits/prm/multiple_parameter_loop_02.prm
similarity index 100%
rename from tests/bits/multiple_parameter_loop_02/prm
rename to tests/bits/prm/multiple_parameter_loop_02.prm
diff --git a/tests/bits/parameter_handler_1/prm b/tests/bits/prm/parameter_handler_1.prm
similarity index 100%
rename from tests/bits/parameter_handler_1/prm
rename to tests/bits/prm/parameter_handler_1.prm
diff --git a/tests/bits/parameter_handler_10/prm b/tests/bits/prm/parameter_handler_10.prm
similarity index 100%
rename from tests/bits/parameter_handler_10/prm
rename to tests/bits/prm/parameter_handler_10.prm
diff --git a/tests/bits/parameter_handler_11/prm b/tests/bits/prm/parameter_handler_11.prm
similarity index 100%
rename from tests/bits/parameter_handler_11/prm
rename to tests/bits/prm/parameter_handler_11.prm
diff --git a/tests/bits/parameter_handler_13/prm b/tests/bits/prm/parameter_handler_13.prm
similarity index 100%
rename from tests/bits/parameter_handler_13/prm
rename to tests/bits/prm/parameter_handler_13.prm
diff --git a/tests/bits/parameter_handler_13a/prm b/tests/bits/prm/parameter_handler_13a.prm
similarity index 100%
rename from tests/bits/parameter_handler_13a/prm
rename to tests/bits/prm/parameter_handler_13a.prm
diff --git a/tests/bits/parameter_handler_1_exception/prm b/tests/bits/prm/parameter_handler_1_exception.prm
similarity index 100%
rename from tests/bits/parameter_handler_1_exception/prm
rename to tests/bits/prm/parameter_handler_1_exception.prm
diff --git a/tests/bits/parameter_handler_1a/prm b/tests/bits/prm/parameter_handler_1a.prm
similarity index 100%
rename from tests/bits/parameter_handler_1a/prm
rename to tests/bits/prm/parameter_handler_1a.prm
diff --git a/tests/bits/parameter_handler_2/prm b/tests/bits/prm/parameter_handler_2.prm
similarity index 100%
rename from tests/bits/parameter_handler_2/prm
rename to tests/bits/prm/parameter_handler_2.prm
diff --git a/tests/bits/parameter_handler_2_read_from_string/prm b/tests/bits/prm/parameter_handler_2_read_from_string.prm
similarity index 100%
rename from tests/bits/parameter_handler_2_read_from_string/prm
rename to tests/bits/prm/parameter_handler_2_read_from_string.prm
diff --git a/tests/bits/parameter_handler_3/prm b/tests/bits/prm/parameter_handler_3.prm
similarity index 100%
rename from tests/bits/parameter_handler_3/prm
rename to tests/bits/prm/parameter_handler_3.prm
diff --git a/tests/bits/parameter_handler_6_bool/prm b/tests/bits/prm/parameter_handler_6_bool.prm
similarity index 100%
rename from tests/bits/parameter_handler_6_bool/prm
rename to tests/bits/prm/parameter_handler_6_bool.prm
diff --git a/tests/bits/parameter_handler_8/prm b/tests/bits/prm/parameter_handler_8.prm
similarity index 100%
rename from tests/bits/parameter_handler_8/prm
rename to tests/bits/prm/parameter_handler_8.prm
diff --git a/tests/bits/parameter_handler_read_xml/prm b/tests/bits/prm/parameter_handler_read_xml.prm
similarity index 100%
rename from tests/bits/parameter_handler_read_xml/prm
rename to tests/bits/prm/parameter_handler_read_xml.prm
diff --git a/tests/bits/parameter_handler_read_xml_error_01/prm b/tests/bits/prm/parameter_handler_read_xml_error_01.prm
similarity index 100%
rename from tests/bits/parameter_handler_read_xml_error_01/prm
rename to tests/bits/prm/parameter_handler_read_xml_error_01.prm
diff --git a/tests/bits/parameter_handler_read_xml_error_02/prm b/tests/bits/prm/parameter_handler_read_xml_error_02.prm
similarity index 100%
rename from tests/bits/parameter_handler_read_xml_error_02/prm
rename to tests/bits/prm/parameter_handler_read_xml_error_02.prm
diff --git a/tests/bits/parameter_handler_read_xml_error_03/prm b/tests/bits/prm/parameter_handler_read_xml_error_03.prm
similarity index 100%
rename from tests/bits/parameter_handler_read_xml_error_03/prm
rename to tests/bits/prm/parameter_handler_read_xml_error_03.prm
diff --git a/tests/bits/parameter_handler_read_xml_error_04/prm b/tests/bits/prm/parameter_handler_read_xml_error_04.prm
similarity index 100%
rename from tests/bits/parameter_handler_read_xml_error_04/prm
rename to tests/bits/prm/parameter_handler_read_xml_error_04.prm
diff --git a/tests/bits/step-5.cc b/tests/bits/step-5.cc
index b1942659d0..4733291f6f 100644
--- a/tests/bits/step-5.cc
+++ b/tests/bits/step-5.cc
@@ -300,7 +300,7 @@ void LaplaceProblem<dim>::run ()
         {
           GridIn<dim> grid_in;
           grid_in.attach_triangulation (triangulation);
-          std::ifstream input_file(SOURCE_DIR "/step-5/circle-grid.inp");
+          std::ifstream input_file(SOURCE_DIR "/grids/circle-grid.inp");
           Assert (dim==2, ExcInternalError());
 
           grid_in.read_ucd (input_file);
diff --git a/tests/fail/abf_approximation_01/rt.gpl b/tests/fail/rt/rt.gpl
similarity index 100%
rename from tests/fail/abf_approximation_01/rt.gpl
rename to tests/fail/rt/rt.gpl
diff --git a/tests/fail/rt_distorted_01/rt.gpl b/tests/fail/rt_distorted_01/rt.gpl
deleted file mode 100644
index 6a47c2f34e..0000000000
--- a/tests/fail/rt_distorted_01/rt.gpl
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/gnuplot -persist
-#
-#    
-#    	G N U P L O T
-#    	Version 4.0 patchlevel 0
-#    	last modified Thu Apr 15 14:44:22 CEST 2004
-#    	System: Linux 2.6.11.4-21.11-smp
-#    
-#    	Copyright (C) 1986 - 1993, 1998, 2004, 2006
-#    	Thomas Williams, Colin Kelley and many others
-#    
-#    	This is gnuplot version 4.0.  Please refer to the documentation
-#    	for command syntax changes.  The old syntax will be accepted
-#    	throughout the 4.0 series, but all save files use the new syntax.
-#    
-#    	Type `help` to access the on-line reference manual.
-#    	The gnuplot FAQ is available from
-#    		http://www.gnuplot.info/faq/
-#    
-#    	Send comments and requests for help to
-#    		<gnuplot-info@lists.sourceforge.net>
-#    	Send bugs, suggestions and mods to
-#    		<gnuplot-bugs@lists.sourceforge.net>
-#    
-set terminal postscript eps color solid enhanced 20
-# set output
-unset clip points
-set clip one
-unset clip two
-set bar 1.000000
-set border 31 lt -1 lw 1.000
-set xdata
-set ydata
-set zdata
-set x2data
-set y2data
-set timefmt x "%d/%m/%y,%H:%M"
-set timefmt y "%d/%m/%y,%H:%M"
-set timefmt z "%d/%m/%y,%H:%M"
-set timefmt x2 "%d/%m/%y,%H:%M"
-set timefmt y2 "%d/%m/%y,%H:%M"
-set timefmt cb "%d/%m/%y,%H:%M"
-set boxwidth
-set style fill empty border
-set dummy x,y
-set format x "% g"
-set format y "% g"
-set format x2 "% g"
-set format y2 "% g"
-set format z "% g"
-set format cb "% g"
-set angles radians
-unset grid
-set key title ""
-set key right top Right noreverse enhanced box linetype -2 linewidth 1.000 samplen 4 spacing 1 width 0 height 0 autotitles
-unset label
-unset arrow
-unset style line
-unset style arrow
-unset logscale
-set offsets 0, 0, 0, 0
-set pointsize 1
-set encoding default
-unset polar
-unset parametric
-unset decimalsign
-set view 60, 20, 1, 1
-set samples 100, 100
-set isosamples 10, 10
-set surface
-unset contour
-set clabel '%8.3g'
-set mapping cartesian
-set datafile separator whitespace
-set hidden3d offset 1 trianglepattern 3 undefined 1 altdiagonal bentover
-set cntrparam order 4
-set cntrparam linear
-set cntrparam levels auto 5
-set cntrparam points 5
-set size ratio 0 1,1
-set origin 0,0
-set style data lines
-set style function lines
-set xzeroaxis lt -2 lw 1.000
-set yzeroaxis lt -2 lw 1.000
-set x2zeroaxis lt -2 lw 1.000
-set y2zeroaxis lt -2 lw 1.000
-set tics in
-set ticslevel 0.5
-set ticscale 1 0.5
-set mxtics default
-set mytics default
-set mztics default
-set mx2tics default
-set my2tics default
-set mcbtics default
-set xtics border mirror norotate autofreq 
-set ytics border mirror norotate autofreq 
-set ztics border nomirror norotate autofreq 
-set nox2tics
-set noy2tics
-set cbtics border mirror norotate autofreq 
-set title "" 0.000000,0.000000  font ""
-set timestamp "" bottom norotate 0.000000,0.000000  ""
-set rrange [ * : * ] noreverse nowriteback  # (currently [0.00000:10.0000] )
-set trange [ * : * ] noreverse nowriteback  # (currently [-5.00000:5.00000] )
-set urange [ * : * ] noreverse nowriteback  # (currently [-5.00000:5.00000] )
-set vrange [ * : * ] noreverse nowriteback  # (currently [-5.00000:5.00000] )
-set xlabel "x" 0.000000,0.000000  font ""
-set x2label "" 0.000000,0.000000  font ""
-set xrange [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
-set x2range [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
-set ylabel "y" 0.000000,0.000000  font ""
-set y2label "" 0.000000,0.000000  font ""
-set yrange [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
-set y2range [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
-set zlabel "" 0.000000,0.000000  font ""
-set zrange [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
-set cblabel "" 0.000000,0.000000  font ""
-set cbrange [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
-set zero 1e-08
-set lmargin -1
-set bmargin -1
-set rmargin -1
-set tmargin -1
-set locale "C"
-set pm3d scansautomatic flush begin noftriangles nohidden3d implicit corners2color mean
-unset pm3d
-set palette positive nops_allcF maxcolors 0 gamma 1.5 color model RGB 
-set palette rgbformulae 7, 5, 15
-set colorbox default
-set colorbox vertical origin 0.9,0.2 size 0.1,0.63 bdefault
-set loadpath 
-set fontpath 
-set fit noerrorvariables
-set output "RT1_00_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:3 title "v0_x"
-set output "RT1_00_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:4 title "v0_y"
-set output "RT1_01_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:5 title "v1_x"
-set output "RT1_01_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:6 title "v1_y"
-set output "RT1_02_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:7 title "v2_x"
-set output "RT1_02_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:8 title "v2_y"
-set output "RT1_03_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:9 title "v3_x"
-set output "RT1_03_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:10 title "v3_y"
-set output "RT1_04_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:11 title "v4_x"
-set output "RT1_04_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:12 title "v4_y"
-set output "RT1_05_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:13 title "v5_x"
-set output "RT1_05_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:14 title "v5_y"
-set output "RT1_06_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:15 title "v6_x"
-set output "RT1_06_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:16 title "v6_y"
-set output "RT1_07_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:17 title "v7_x"
-set output "RT1_07_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:18 title "v7_y"
-set output "RT1_08_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:19 title "v8_x"
-set output "RT1_08_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:20 title "v8_y"
-set output "RT1_09_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:21 title "v9_x"
-set output "RT1_09_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:22 title "v9_y"
-set output "RT1_10_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:23 title "v10_x"
-set output "RT1_10_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:24 title "v10_y"
-set output "RT1_11_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:25 title "v11_x"
-set output "RT1_11_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:26 title "v11_y"
-#    EOF
diff --git a/tests/fail/rt_distorted_02/rt.gpl b/tests/fail/rt_distorted_02/rt.gpl
deleted file mode 100644
index 6a47c2f34e..0000000000
--- a/tests/fail/rt_distorted_02/rt.gpl
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/gnuplot -persist
-#
-#    
-#    	G N U P L O T
-#    	Version 4.0 patchlevel 0
-#    	last modified Thu Apr 15 14:44:22 CEST 2004
-#    	System: Linux 2.6.11.4-21.11-smp
-#    
-#    	Copyright (C) 1986 - 1993, 1998, 2004, 2006
-#    	Thomas Williams, Colin Kelley and many others
-#    
-#    	This is gnuplot version 4.0.  Please refer to the documentation
-#    	for command syntax changes.  The old syntax will be accepted
-#    	throughout the 4.0 series, but all save files use the new syntax.
-#    
-#    	Type `help` to access the on-line reference manual.
-#    	The gnuplot FAQ is available from
-#    		http://www.gnuplot.info/faq/
-#    
-#    	Send comments and requests for help to
-#    		<gnuplot-info@lists.sourceforge.net>
-#    	Send bugs, suggestions and mods to
-#    		<gnuplot-bugs@lists.sourceforge.net>
-#    
-set terminal postscript eps color solid enhanced 20
-# set output
-unset clip points
-set clip one
-unset clip two
-set bar 1.000000
-set border 31 lt -1 lw 1.000
-set xdata
-set ydata
-set zdata
-set x2data
-set y2data
-set timefmt x "%d/%m/%y,%H:%M"
-set timefmt y "%d/%m/%y,%H:%M"
-set timefmt z "%d/%m/%y,%H:%M"
-set timefmt x2 "%d/%m/%y,%H:%M"
-set timefmt y2 "%d/%m/%y,%H:%M"
-set timefmt cb "%d/%m/%y,%H:%M"
-set boxwidth
-set style fill empty border
-set dummy x,y
-set format x "% g"
-set format y "% g"
-set format x2 "% g"
-set format y2 "% g"
-set format z "% g"
-set format cb "% g"
-set angles radians
-unset grid
-set key title ""
-set key right top Right noreverse enhanced box linetype -2 linewidth 1.000 samplen 4 spacing 1 width 0 height 0 autotitles
-unset label
-unset arrow
-unset style line
-unset style arrow
-unset logscale
-set offsets 0, 0, 0, 0
-set pointsize 1
-set encoding default
-unset polar
-unset parametric
-unset decimalsign
-set view 60, 20, 1, 1
-set samples 100, 100
-set isosamples 10, 10
-set surface
-unset contour
-set clabel '%8.3g'
-set mapping cartesian
-set datafile separator whitespace
-set hidden3d offset 1 trianglepattern 3 undefined 1 altdiagonal bentover
-set cntrparam order 4
-set cntrparam linear
-set cntrparam levels auto 5
-set cntrparam points 5
-set size ratio 0 1,1
-set origin 0,0
-set style data lines
-set style function lines
-set xzeroaxis lt -2 lw 1.000
-set yzeroaxis lt -2 lw 1.000
-set x2zeroaxis lt -2 lw 1.000
-set y2zeroaxis lt -2 lw 1.000
-set tics in
-set ticslevel 0.5
-set ticscale 1 0.5
-set mxtics default
-set mytics default
-set mztics default
-set mx2tics default
-set my2tics default
-set mcbtics default
-set xtics border mirror norotate autofreq 
-set ytics border mirror norotate autofreq 
-set ztics border nomirror norotate autofreq 
-set nox2tics
-set noy2tics
-set cbtics border mirror norotate autofreq 
-set title "" 0.000000,0.000000  font ""
-set timestamp "" bottom norotate 0.000000,0.000000  ""
-set rrange [ * : * ] noreverse nowriteback  # (currently [0.00000:10.0000] )
-set trange [ * : * ] noreverse nowriteback  # (currently [-5.00000:5.00000] )
-set urange [ * : * ] noreverse nowriteback  # (currently [-5.00000:5.00000] )
-set vrange [ * : * ] noreverse nowriteback  # (currently [-5.00000:5.00000] )
-set xlabel "x" 0.000000,0.000000  font ""
-set x2label "" 0.000000,0.000000  font ""
-set xrange [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
-set x2range [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
-set ylabel "y" 0.000000,0.000000  font ""
-set y2label "" 0.000000,0.000000  font ""
-set yrange [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
-set y2range [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
-set zlabel "" 0.000000,0.000000  font ""
-set zrange [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
-set cblabel "" 0.000000,0.000000  font ""
-set cbrange [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
-set zero 1e-08
-set lmargin -1
-set bmargin -1
-set rmargin -1
-set tmargin -1
-set locale "C"
-set pm3d scansautomatic flush begin noftriangles nohidden3d implicit corners2color mean
-unset pm3d
-set palette positive nops_allcF maxcolors 0 gamma 1.5 color model RGB 
-set palette rgbformulae 7, 5, 15
-set colorbox default
-set colorbox vertical origin 0.9,0.2 size 0.1,0.63 bdefault
-set loadpath 
-set fontpath 
-set fit noerrorvariables
-set output "RT1_00_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:3 title "v0_x"
-set output "RT1_00_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:4 title "v0_y"
-set output "RT1_01_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:5 title "v1_x"
-set output "RT1_01_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:6 title "v1_y"
-set output "RT1_02_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:7 title "v2_x"
-set output "RT1_02_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:8 title "v2_y"
-set output "RT1_03_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:9 title "v3_x"
-set output "RT1_03_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:10 title "v3_y"
-set output "RT1_04_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:11 title "v4_x"
-set output "RT1_04_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:12 title "v4_y"
-set output "RT1_05_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:13 title "v5_x"
-set output "RT1_05_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:14 title "v5_y"
-set output "RT1_06_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:15 title "v6_x"
-set output "RT1_06_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:16 title "v6_y"
-set output "RT1_07_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:17 title "v7_x"
-set output "RT1_07_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:18 title "v7_y"
-set output "RT1_08_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:19 title "v8_x"
-set output "RT1_08_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:20 title "v8_y"
-set output "RT1_09_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:21 title "v9_x"
-set output "RT1_09_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:22 title "v9_y"
-set output "RT1_10_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:23 title "v10_x"
-set output "RT1_10_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:24 title "v10_y"
-set output "RT1_11_x.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:25 title "v11_x"
-set output "RT1_11_y.eps"
-splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:26 title "v11_y"
-#    EOF
diff --git a/tests/hp/step-5/circle-grid.inp b/tests/hp/grids/circle-grid.inp
similarity index 100%
rename from tests/hp/step-5/circle-grid.inp
rename to tests/hp/grids/circle-grid.inp
diff --git a/tests/hp/hp_constraints_dgp/project_dgp_01/cmp/generic b/tests/hp/hp_constraints_dgp/project_dgp_01/cmp/generic
deleted file mode 100644
index adfd75df87..0000000000
--- a/tests/hp/hp_constraints_dgp/project_dgp_01/cmp/generic
+++ /dev/null
@@ -1,178 +0,0 @@
-
-DEAL::n_dofs=8
-DEAL:cg::Starting value 0.354
-DEAL:cg::Convergence step 1 value 0
-DEAL::FE_DGP<1>(0), P_0, rel. error=0
-DEAL:cg::Starting value 0.736
-DEAL:cg::Convergence step 1 value 0
-DEAL::FE_DGP<1>(0), P_1, rel. error=0.0123
-DEAL:cg::Starting value 1.18
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(0), P_2, rel. error=0.0203
-DEAL::n_dofs=16
-DEAL:cg::Starting value 0.354
-DEAL:cg::Convergence step 1 value 0
-DEAL::FE_DGP<1>(1), P_0, rel. error=0
-DEAL:cg::Starting value 0.736
-DEAL:cg::Convergence step 1 value 0
-DEAL::FE_DGP<1>(1), P_1, rel. error=0
-DEAL:cg::Starting value 1.18
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(1), P_2, rel. error=0.000370
-DEAL:cg::Starting value 1.68
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(1), P_3, rel. error=0.000834
-DEAL::n_dofs=24
-DEAL:cg::Starting value 0.354
-DEAL:cg::Convergence step 1 value 0
-DEAL::FE_DGP<1>(2), P_0, rel. error=0
-DEAL:cg::Starting value 0.736
-DEAL:cg::Convergence step 1 value 0
-DEAL::FE_DGP<1>(2), P_1, rel. error=0
-DEAL:cg::Starting value 1.18
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(2), P_2, rel. error=0
-DEAL:cg::Starting value 1.68
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(2), P_3, rel. error=1.10e-05
-DEAL:cg::Starting value 2.24
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(2), P_4, rel. error=3.12e-05
-DEAL::n_dofs=32
-DEAL:cg::Starting value 0.354
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(3), P_0, rel. error=0
-DEAL:cg::Starting value 0.736
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(3), P_1, rel. error=0
-DEAL:cg::Starting value 1.18
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(3), P_2, rel. error=0
-DEAL:cg::Starting value 1.68
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(3), P_3, rel. error=0
-DEAL:cg::Starting value 2.24
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(3), P_4, rel. error=3.25e-07
-DEAL:cg::Starting value 2.84
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(3), P_5, rel. error=1.11e-06
-DEAL::n_dofs=40
-DEAL:cg::Starting value 0.354
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(4), P_0, rel. error=0
-DEAL:cg::Starting value 0.736
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(4), P_1, rel. error=0
-DEAL:cg::Starting value 1.18
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(4), P_2, rel. error=0
-DEAL:cg::Starting value 1.68
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(4), P_3, rel. error=0
-DEAL:cg::Starting value 2.24
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(4), P_4, rel. error=0
-DEAL:cg::Starting value 2.84
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(4), P_5, rel. error=9.64e-09
-DEAL:cg::Starting value 3.49
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<1>(4), P_6, rel. error=3.87e-08
-DEAL::n_dofs=64
-DEAL:cg::Starting value 0.375
-DEAL:cg::Convergence step 1 value 0
-DEAL::FE_DGP<2>(0), P_0, rel. error=0
-DEAL:cg::Starting value 0.767
-DEAL:cg::Convergence step 1 value 0
-DEAL::FE_DGP<2>(0), P_1, rel. error=0.00329
-DEAL:cg::Starting value 1.20
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<2>(0), P_2, rel. error=0.00558
-DEAL::n_dofs=192
-DEAL:cg::Starting value 0.375
-DEAL:cg::Convergence step 1 value 0
-DEAL::FE_DGP<2>(1), P_0, rel. error=0
-DEAL:cg::Starting value 0.767
-DEAL:cg::Convergence step 1 value 0
-DEAL::FE_DGP<2>(1), P_1, rel. error=0
-DEAL:cg::Starting value 1.20
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<2>(1), P_2, rel. error=0.000102
-DEAL:cg::Starting value 1.66
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<2>(1), P_3, rel. error=0.000236
-DEAL::n_dofs=384
-DEAL:cg::Starting value 0.375
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<2>(2), P_0, rel. error=0
-DEAL:cg::Starting value 0.767
-DEAL:cg::Convergence step 1 value 0
-DEAL::FE_DGP<2>(2), P_1, rel. error=0
-DEAL:cg::Starting value 1.20
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<2>(2), P_2, rel. error=0
-DEAL:cg::Starting value 1.66
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<2>(2), P_3, rel. error=3.10e-06
-DEAL:cg::Starting value 2.17
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<2>(2), P_4, rel. error=9.01e-06
-DEAL::n_dofs=640
-DEAL:cg::Starting value 0.375
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<2>(3), P_0, rel. error=0
-DEAL:cg::Starting value 0.767
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<2>(3), P_1, rel. error=0
-DEAL:cg::Starting value 1.20
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<2>(3), P_2, rel. error=0
-DEAL:cg::Starting value 1.66
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<2>(3), P_3, rel. error=0
-DEAL:cg::Starting value 2.17
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<2>(3), P_4, rel. error=9.38e-08
-DEAL:cg::Starting value 2.70
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<2>(3), P_5, rel. error=3.27e-07
-DEAL::n_dofs=512
-DEAL:cg::Starting value 0.265
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<3>(0), P_0, rel. error=0
-DEAL:cg::Starting value 0.539
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<3>(0), P_1, rel. error=0.000979
-DEAL:cg::Starting value 0.831
-DEAL:cg::Convergence step 1 value 0
-DEAL::FE_DGP<3>(0), P_2, rel. error=0.00168
-DEAL::n_dofs=2048
-DEAL:cg::Starting value 0.265
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<3>(1), P_0, rel. error=0
-DEAL:cg::Starting value 0.539
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<3>(1), P_1, rel. error=0
-DEAL:cg::Starting value 0.831
-DEAL:cg::Convergence step 1 value 0
-DEAL::FE_DGP<3>(1), P_2, rel. error=3.07e-05
-DEAL:cg::Starting value 1.14
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<3>(1), P_3, rel. error=7.18e-05
-DEAL::n_dofs=5120
-DEAL:cg::Starting value 0.265
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<3>(2), P_0, rel. error=0
-DEAL:cg::Starting value 0.539
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<3>(2), P_1, rel. error=0
-DEAL:cg::Starting value 0.831
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<3>(2), P_2, rel. error=0
-DEAL:cg::Starting value 1.14
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<3>(2), P_3, rel. error=9.44e-07
-DEAL:cg::Starting value 1.47
-DEAL:cg::Convergence step 2 value 0
-DEAL::FE_DGP<3>(2), P_4, rel. error=2.77e-06
diff --git a/tests/hp/project_01/cmp/generic b/tests/hp/project_01/cmp/generic
deleted file mode 100644
index 8889fb7a29..0000000000
--- a/tests/hp/project_01/cmp/generic
+++ /dev/null
@@ -1,585 +0,0 @@
-
-DEAL::0.00000 0
-DEAL::0.250000 0.250000
-DEAL::0.250000 0.250000
-DEAL::0.500000 0.500000
-DEAL::0.500000 0.500000
-DEAL::0.750000 0.750000
-DEAL::0.750000 0.750000
-DEAL::1.00000 1.00000
-DEAL::0.00000 0.00000 0
-DEAL::0.250000 0.00000 0
-DEAL::0.00000 0.250000 0
-DEAL::0.250000 0.250000 0.0625000
-DEAL::0.250000 0.00000 0
-DEAL::0.500000 0.00000 0
-DEAL::0.250000 0.250000 0.0625000
-DEAL::0.500000 0.250000 0.125000
-DEAL::0.00000 0.250000 0
-DEAL::0.250000 0.250000 0.0625000
-DEAL::0.00000 0.500000 0
-DEAL::0.250000 0.500000 0.125000
-DEAL::0.250000 0.250000 0.0625000
-DEAL::0.500000 0.250000 0.125000
-DEAL::0.250000 0.500000 0.125000
-DEAL::0.500000 0.500000 0.250000
-DEAL::0.500000 0.00000 0
-DEAL::0.750000 0.00000 0
-DEAL::0.500000 0.250000 0.125000
-DEAL::0.750000 0.250000 0.187500
-DEAL::0.750000 0.00000 0
-DEAL::1.00000 0.00000 0
-DEAL::0.750000 0.250000 0.187500
-DEAL::1.00000 0.250000 0.250000
-DEAL::0.500000 0.250000 0.125000
-DEAL::0.750000 0.250000 0.187500
-DEAL::0.500000 0.500000 0.250000
-DEAL::0.750000 0.500000 0.375000
-DEAL::0.750000 0.250000 0.187500
-DEAL::1.00000 0.250000 0.250000
-DEAL::0.750000 0.500000 0.375000
-DEAL::1.00000 0.500000 0.500000
-DEAL::0.00000 0.500000 0
-DEAL::0.250000 0.500000 0.125000
-DEAL::0.00000 0.750000 0
-DEAL::0.250000 0.750000 0.187500
-DEAL::0.250000 0.500000 0.125000
-DEAL::0.500000 0.500000 0.250000
-DEAL::0.250000 0.750000 0.187500
-DEAL::0.500000 0.750000 0.375000
-DEAL::0.00000 0.750000 0
-DEAL::0.250000 0.750000 0.187500
-DEAL::0.00000 1.00000 0
-DEAL::0.250000 1.00000 0.250000
-DEAL::0.250000 0.750000 0.187500
-DEAL::0.500000 0.750000 0.375000
-DEAL::0.250000 1.00000 0.250000
-DEAL::0.500000 1.00000 0.500000
-DEAL::0.500000 0.500000 0.250000
-DEAL::0.750000 0.500000 0.375000
-DEAL::0.500000 0.750000 0.375000
-DEAL::0.750000 0.750000 0.562500
-DEAL::0.750000 0.500000 0.375000
-DEAL::1.00000 0.500000 0.500000
-DEAL::0.750000 0.750000 0.562500
-DEAL::1.00000 0.750000 0.750000
-DEAL::0.500000 0.750000 0.375000
-DEAL::0.750000 0.750000 0.562500
-DEAL::0.500000 1.00000 0.500000
-DEAL::0.750000 1.00000 0.750000
-DEAL::0.750000 0.750000 0.562500
-DEAL::1.00000 0.750000 0.750000
-DEAL::0.750000 1.00000 0.750000
-DEAL::1.00000 1.00000 1.00000
-DEAL::0.00000 0.00000 0.00000 0
-DEAL::0.250000 0.00000 0.00000 0
-DEAL::0.00000 0.250000 0.00000 0
-DEAL::0.250000 0.250000 0.00000 0
-DEAL::0.00000 0.00000 0.250000 0
-DEAL::0.250000 0.00000 0.250000 0
-DEAL::0.00000 0.250000 0.250000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.250000 0.00000 0.00000 0
-DEAL::0.500000 0.00000 0.00000 0
-DEAL::0.250000 0.250000 0.00000 0
-DEAL::0.500000 0.250000 0.00000 0
-DEAL::0.250000 0.00000 0.250000 0
-DEAL::0.500000 0.00000 0.250000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.00000 0.250000 0.00000 0
-DEAL::0.250000 0.250000 0.00000 0
-DEAL::0.00000 0.500000 0.00000 0
-DEAL::0.250000 0.500000 0.00000 0
-DEAL::0.00000 0.250000 0.250000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.00000 0.500000 0.250000 0
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.250000 0.250000 0.00000 0
-DEAL::0.500000 0.250000 0.00000 0
-DEAL::0.250000 0.500000 0.00000 0
-DEAL::0.500000 0.500000 0.00000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.00000 0.00000 0.250000 0
-DEAL::0.250000 0.00000 0.250000 0
-DEAL::0.00000 0.250000 0.250000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.00000 0.00000 0.500000 0
-DEAL::0.250000 0.00000 0.500000 0
-DEAL::0.00000 0.250000 0.500000 0
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.250000 0.00000 0.250000 0
-DEAL::0.500000 0.00000 0.250000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.250000 0.00000 0.500000 0
-DEAL::0.500000 0.00000 0.500000 0
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.00000 0.250000 0.250000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.00000 0.500000 0.250000 0
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.00000 0.250000 0.500000 0
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.00000 0.500000 0.500000 0
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.500000 0.00000 0.00000 0
-DEAL::0.750000 0.00000 0.00000 0
-DEAL::0.500000 0.250000 0.00000 0
-DEAL::0.750000 0.250000 0.00000 0
-DEAL::0.500000 0.00000 0.250000 0
-DEAL::0.750000 0.00000 0.250000 0
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::0.750000 0.00000 0.00000 0
-DEAL::1.00000 0.00000 0.00000 0
-DEAL::0.750000 0.250000 0.00000 0
-DEAL::1.00000 0.250000 0.00000 0
-DEAL::0.750000 0.00000 0.250000 0
-DEAL::1.00000 0.00000 0.250000 0
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::1.00000 0.250000 0.250000 0.0625000
-DEAL::0.500000 0.250000 0.00000 0
-DEAL::0.750000 0.250000 0.00000 0
-DEAL::0.500000 0.500000 0.00000 0
-DEAL::0.750000 0.500000 0.00000 0
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::0.750000 0.250000 0.00000 0
-DEAL::1.00000 0.250000 0.00000 0
-DEAL::0.750000 0.500000 0.00000 0
-DEAL::1.00000 0.500000 0.00000 0
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::1.00000 0.250000 0.250000 0.0625000
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::1.00000 0.500000 0.250000 0.125000
-DEAL::0.500000 0.00000 0.250000 0
-DEAL::0.750000 0.00000 0.250000 0
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::0.500000 0.00000 0.500000 0
-DEAL::0.750000 0.00000 0.500000 0
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::0.750000 0.00000 0.250000 0
-DEAL::1.00000 0.00000 0.250000 0
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::1.00000 0.250000 0.250000 0.0625000
-DEAL::0.750000 0.00000 0.500000 0
-DEAL::1.00000 0.00000 0.500000 0
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::1.00000 0.250000 0.500000 0.125000
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::1.00000 0.250000 0.250000 0.0625000
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::1.00000 0.500000 0.250000 0.125000
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::1.00000 0.250000 0.500000 0.125000
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::1.00000 0.500000 0.500000 0.250000
-DEAL::0.00000 0.500000 0.00000 0
-DEAL::0.250000 0.500000 0.00000 0
-DEAL::0.00000 0.750000 0.00000 0
-DEAL::0.250000 0.750000 0.00000 0
-DEAL::0.00000 0.500000 0.250000 0
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.00000 0.750000 0.250000 0
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.250000 0.500000 0.00000 0
-DEAL::0.500000 0.500000 0.00000 0
-DEAL::0.250000 0.750000 0.00000 0
-DEAL::0.500000 0.750000 0.00000 0
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.00000 0.750000 0.00000 0
-DEAL::0.250000 0.750000 0.00000 0
-DEAL::0.00000 1.00000 0.00000 0
-DEAL::0.250000 1.00000 0.00000 0
-DEAL::0.00000 0.750000 0.250000 0
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.00000 1.00000 0.250000 0
-DEAL::0.250000 1.00000 0.250000 0.0625000
-DEAL::0.250000 0.750000 0.00000 0
-DEAL::0.500000 0.750000 0.00000 0
-DEAL::0.250000 1.00000 0.00000 0
-DEAL::0.500000 1.00000 0.00000 0
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.250000 1.00000 0.250000 0.0625000
-DEAL::0.500000 1.00000 0.250000 0.125000
-DEAL::0.00000 0.500000 0.250000 0
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.00000 0.750000 0.250000 0
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.00000 0.500000 0.500000 0
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.00000 0.750000 0.500000 0
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.00000 0.750000 0.250000 0
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.00000 1.00000 0.250000 0
-DEAL::0.250000 1.00000 0.250000 0.0625000
-DEAL::0.00000 0.750000 0.500000 0
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.00000 1.00000 0.500000 0
-DEAL::0.250000 1.00000 0.500000 0.125000
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.250000 1.00000 0.250000 0.0625000
-DEAL::0.500000 1.00000 0.250000 0.125000
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.250000 1.00000 0.500000 0.125000
-DEAL::0.500000 1.00000 0.500000 0.250000
-DEAL::0.500000 0.500000 0.00000 0
-DEAL::0.750000 0.500000 0.00000 0
-DEAL::0.500000 0.750000 0.00000 0
-DEAL::0.750000 0.750000 0.00000 0
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::0.750000 0.500000 0.00000 0
-DEAL::1.00000 0.500000 0.00000 0
-DEAL::0.750000 0.750000 0.00000 0
-DEAL::1.00000 0.750000 0.00000 0
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::1.00000 0.500000 0.250000 0.125000
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::1.00000 0.750000 0.250000 0.187500
-DEAL::0.500000 0.750000 0.00000 0
-DEAL::0.750000 0.750000 0.00000 0
-DEAL::0.500000 1.00000 0.00000 0
-DEAL::0.750000 1.00000 0.00000 0
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::0.500000 1.00000 0.250000 0.125000
-DEAL::0.750000 1.00000 0.250000 0.187500
-DEAL::0.750000 0.750000 0.00000 0
-DEAL::1.00000 0.750000 0.00000 0
-DEAL::0.750000 1.00000 0.00000 0
-DEAL::1.00000 1.00000 0.00000 0
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::1.00000 0.750000 0.250000 0.187500
-DEAL::0.750000 1.00000 0.250000 0.187500
-DEAL::1.00000 1.00000 0.250000 0.250000
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::1.00000 0.500000 0.250000 0.125000
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::1.00000 0.750000 0.250000 0.187500
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::1.00000 0.500000 0.500000 0.250000
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::1.00000 0.750000 0.500000 0.375000
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::0.500000 1.00000 0.250000 0.125000
-DEAL::0.750000 1.00000 0.250000 0.187500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::0.500000 1.00000 0.500000 0.250000
-DEAL::0.750000 1.00000 0.500000 0.375000
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::1.00000 0.750000 0.250000 0.187500
-DEAL::0.750000 1.00000 0.250000 0.187500
-DEAL::1.00000 1.00000 0.250000 0.250000
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::1.00000 0.750000 0.500000 0.375000
-DEAL::0.750000 1.00000 0.500000 0.375000
-DEAL::1.00000 1.00000 0.500000 0.500000
-DEAL::0.00000 0.00000 0.500000 0
-DEAL::0.250000 0.00000 0.500000 0
-DEAL::0.00000 0.250000 0.500000 0
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.00000 0.00000 0.750000 0
-DEAL::0.250000 0.00000 0.750000 0
-DEAL::0.00000 0.250000 0.750000 0
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.250000 0.00000 0.500000 0
-DEAL::0.500000 0.00000 0.500000 0
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.250000 0.00000 0.750000 0
-DEAL::0.500000 0.00000 0.750000 0
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.00000 0.250000 0.500000 0
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.00000 0.500000 0.500000 0
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.00000 0.250000 0.750000 0
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.00000 0.500000 0.750000 0
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.00000 0.00000 0.750000 0
-DEAL::0.250000 0.00000 0.750000 0
-DEAL::0.00000 0.250000 0.750000 0
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.00000 0.00000 1.00000 0
-DEAL::0.250000 0.00000 1.00000 0
-DEAL::0.00000 0.250000 1.00000 0
-DEAL::0.250000 0.250000 1.00000 0.0625000
-DEAL::0.250000 0.00000 0.750000 0
-DEAL::0.500000 0.00000 0.750000 0
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.250000 0.00000 1.00000 0
-DEAL::0.500000 0.00000 1.00000 0
-DEAL::0.250000 0.250000 1.00000 0.0625000
-DEAL::0.500000 0.250000 1.00000 0.125000
-DEAL::0.00000 0.250000 0.750000 0
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.00000 0.500000 0.750000 0
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.00000 0.250000 1.00000 0
-DEAL::0.250000 0.250000 1.00000 0.0625000
-DEAL::0.00000 0.500000 1.00000 0
-DEAL::0.250000 0.500000 1.00000 0.125000
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.250000 0.250000 1.00000 0.0625000
-DEAL::0.500000 0.250000 1.00000 0.125000
-DEAL::0.250000 0.500000 1.00000 0.125000
-DEAL::0.500000 0.500000 1.00000 0.250000
-DEAL::0.500000 0.00000 0.500000 0
-DEAL::0.750000 0.00000 0.500000 0
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::0.500000 0.00000 0.750000 0
-DEAL::0.750000 0.00000 0.750000 0
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::0.750000 0.00000 0.500000 0
-DEAL::1.00000 0.00000 0.500000 0
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::1.00000 0.250000 0.500000 0.125000
-DEAL::0.750000 0.00000 0.750000 0
-DEAL::1.00000 0.00000 0.750000 0
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::1.00000 0.250000 0.750000 0.187500
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::1.00000 0.250000 0.500000 0.125000
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::1.00000 0.500000 0.500000 0.250000
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::1.00000 0.250000 0.750000 0.187500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::1.00000 0.500000 0.750000 0.375000
-DEAL::0.500000 0.00000 0.750000 0
-DEAL::0.750000 0.00000 0.750000 0
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::0.500000 0.00000 1.00000 0
-DEAL::0.750000 0.00000 1.00000 0
-DEAL::0.500000 0.250000 1.00000 0.125000
-DEAL::0.750000 0.250000 1.00000 0.187500
-DEAL::0.750000 0.00000 0.750000 0
-DEAL::1.00000 0.00000 0.750000 0
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::1.00000 0.250000 0.750000 0.187500
-DEAL::0.750000 0.00000 1.00000 0
-DEAL::1.00000 0.00000 1.00000 0
-DEAL::0.750000 0.250000 1.00000 0.187500
-DEAL::1.00000 0.250000 1.00000 0.250000
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::0.500000 0.250000 1.00000 0.125000
-DEAL::0.750000 0.250000 1.00000 0.187500
-DEAL::0.500000 0.500000 1.00000 0.250000
-DEAL::0.750000 0.500000 1.00000 0.375000
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::1.00000 0.250000 0.750000 0.187500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::1.00000 0.500000 0.750000 0.375000
-DEAL::0.750000 0.250000 1.00000 0.187500
-DEAL::1.00000 0.250000 1.00000 0.250000
-DEAL::0.750000 0.500000 1.00000 0.375000
-DEAL::1.00000 0.500000 1.00000 0.500000
-DEAL::0.00000 0.500000 0.500000 0
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.00000 0.750000 0.500000 0
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.00000 0.500000 0.750000 0
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.00000 0.750000 0.750000 0
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.00000 0.750000 0.500000 0
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.00000 1.00000 0.500000 0
-DEAL::0.250000 1.00000 0.500000 0.125000
-DEAL::0.00000 0.750000 0.750000 0
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.00000 1.00000 0.750000 0
-DEAL::0.250000 1.00000 0.750000 0.187500
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.250000 1.00000 0.500000 0.125000
-DEAL::0.500000 1.00000 0.500000 0.250000
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.250000 1.00000 0.750000 0.187500
-DEAL::0.500000 1.00000 0.750000 0.375000
-DEAL::0.00000 0.500000 0.750000 0
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.00000 0.750000 0.750000 0
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.00000 0.500000 1.00000 0
-DEAL::0.250000 0.500000 1.00000 0.125000
-DEAL::0.00000 0.750000 1.00000 0
-DEAL::0.250000 0.750000 1.00000 0.187500
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.250000 0.500000 1.00000 0.125000
-DEAL::0.500000 0.500000 1.00000 0.250000
-DEAL::0.250000 0.750000 1.00000 0.187500
-DEAL::0.500000 0.750000 1.00000 0.375000
-DEAL::0.00000 0.750000 0.750000 0
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.00000 1.00000 0.750000 0
-DEAL::0.250000 1.00000 0.750000 0.187500
-DEAL::0.00000 0.750000 1.00000 0
-DEAL::0.250000 0.750000 1.00000 0.187500
-DEAL::0.00000 1.00000 1.00000 0
-DEAL::0.250000 1.00000 1.00000 0.250000
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.250000 1.00000 0.750000 0.187500
-DEAL::0.500000 1.00000 0.750000 0.375000
-DEAL::0.250000 0.750000 1.00000 0.187500
-DEAL::0.500000 0.750000 1.00000 0.375000
-DEAL::0.250000 1.00000 1.00000 0.250000
-DEAL::0.500000 1.00000 1.00000 0.500000
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::1.00000 0.500000 0.500000 0.250000
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::1.00000 0.750000 0.500000 0.375000
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::1.00000 0.500000 0.750000 0.375000
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::1.00000 0.750000 0.750000 0.562500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::0.500000 1.00000 0.500000 0.250000
-DEAL::0.750000 1.00000 0.500000 0.375000
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::0.500000 1.00000 0.750000 0.375000
-DEAL::0.750000 1.00000 0.750000 0.562500
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::1.00000 0.750000 0.500000 0.375000
-DEAL::0.750000 1.00000 0.500000 0.375000
-DEAL::1.00000 1.00000 0.500000 0.500000
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::1.00000 0.750000 0.750000 0.562500
-DEAL::0.750000 1.00000 0.750000 0.562500
-DEAL::1.00000 1.00000 0.750000 0.750000
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::0.500000 0.500000 1.00000 0.250000
-DEAL::0.750000 0.500000 1.00000 0.375000
-DEAL::0.500000 0.750000 1.00000 0.375000
-DEAL::0.750000 0.750000 1.00000 0.562500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::1.00000 0.500000 0.750000 0.375000
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::1.00000 0.750000 0.750000 0.562500
-DEAL::0.750000 0.500000 1.00000 0.375000
-DEAL::1.00000 0.500000 1.00000 0.500000
-DEAL::0.750000 0.750000 1.00000 0.562500
-DEAL::1.00000 0.750000 1.00000 0.750000
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::0.500000 1.00000 0.750000 0.375000
-DEAL::0.750000 1.00000 0.750000 0.562500
-DEAL::0.500000 0.750000 1.00000 0.375000
-DEAL::0.750000 0.750000 1.00000 0.562500
-DEAL::0.500000 1.00000 1.00000 0.500000
-DEAL::0.750000 1.00000 1.00000 0.750000
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::1.00000 0.750000 0.750000 0.562500
-DEAL::0.750000 1.00000 0.750000 0.562500
-DEAL::1.00000 1.00000 0.750000 0.750000
-DEAL::0.750000 0.750000 1.00000 0.562500
-DEAL::1.00000 0.750000 1.00000 0.750000
-DEAL::0.750000 1.00000 1.00000 0.750000
-DEAL::1.00000 1.00000 1.00000 1.00000
diff --git a/tests/hp/project_01_curved_boundary/cmp/generic b/tests/hp/project_01_curved_boundary/cmp/generic
deleted file mode 100644
index 218888d980..0000000000
--- a/tests/hp/project_01_curved_boundary/cmp/generic
+++ /dev/null
@@ -1,165 +0,0 @@
-
-DEAL::0
-DEAL::0
-DEAL::0.227756
-DEAL::0.0359680
-DEAL::0.421875
-DEAL::-0.707107 -0.707107 0.195262
-DEAL::0.707107 -0.707107 0.195262
-DEAL::-0.292893 -0.292893 -0.0797954
-DEAL::0.292893 -0.292893 -0.0797954
-DEAL::-0.707107 -0.707107 0.195262
-DEAL::-0.292893 -0.292893 -0.0797954
-DEAL::-0.707107 0.707107 0.195262
-DEAL::-0.292893 0.292893 -0.0797954
-DEAL::-0.292893 -0.292893 -0.0797954
-DEAL::0.292893 -0.292893 -0.0797954
-DEAL::-0.292893 0.292893 -0.0797954
-DEAL::0.292893 0.292893 -0.0797954
-DEAL::0.707107 -0.707107 0.195262
-DEAL::0.707107 0.707107 0.195262
-DEAL::0.292893 -0.292893 -0.0797954
-DEAL::0.292893 0.292893 -0.0797954
-DEAL::-0.707107 0.707107 0.195262
-DEAL::-0.292893 0.292893 -0.0797954
-DEAL::0.707107 0.707107 0.195262
-DEAL::0.292893 0.292893 -0.0797954
-DEAL::0.0359680
-DEAL::-0.707107 -0.707107 0
-DEAL::0.707107 -0.707107 0
-DEAL::-0.292893 -0.292893 0.0179840
-DEAL::0.292893 -0.292893 0.0179840
-DEAL::-0.707107 -0.707107 0
-DEAL::-0.292893 -0.292893 0.0179840
-DEAL::-0.707107 0.707107 0
-DEAL::-0.292893 0.292893 0.0179840
-DEAL::-0.292893 -0.292893 0.0179840
-DEAL::0.292893 -0.292893 0.0179840
-DEAL::-0.292893 0.292893 0.0179840
-DEAL::0.292893 0.292893 0.0179840
-DEAL::0.707107 -0.707107 0
-DEAL::0.707107 0.707107 0
-DEAL::0.292893 -0.292893 0.0179840
-DEAL::0.292893 0.292893 0.0179840
-DEAL::-0.707107 0.707107 0
-DEAL::-0.292893 0.292893 0.0179840
-DEAL::0.707107 0.707107 0
-DEAL::0.292893 0.292893 0.0179840
-DEAL::0
-DEAL::0
-DEAL::0.166690
-DEAL::0.0709393
-DEAL::0.440214
-DEAL::-0.211325 -0.211325 -0.211325 -0.104038
-DEAL::0.211325 -0.211325 -0.211325 -0.104038
-DEAL::-0.211325 0.211325 -0.211325 -0.104038
-DEAL::0.211325 0.211325 -0.211325 -0.104038
-DEAL::-0.211325 -0.211325 0.211325 -0.104038
-DEAL::0.211325 -0.211325 0.211325 -0.104038
-DEAL::-0.211325 0.211325 0.211325 -0.104038
-DEAL::0.211325 0.211325 0.211325 -0.104038
-DEAL::-0.577350 -0.577350 -0.577350 0.115757
-DEAL::0.577350 -0.577350 -0.577350 0.115757
-DEAL::-0.577350 0.577350 -0.577350 0.115757
-DEAL::0.577350 0.577350 -0.577350 0.115757
-DEAL::-0.211325 -0.211325 -0.211325 -0.104038
-DEAL::0.211325 -0.211325 -0.211325 -0.104038
-DEAL::-0.211325 0.211325 -0.211325 -0.104038
-DEAL::0.211325 0.211325 -0.211325 -0.104038
-DEAL::0.577350 -0.577350 -0.577350 0.115757
-DEAL::0.577350 0.577350 -0.577350 0.115757
-DEAL::0.211325 -0.211325 -0.211325 -0.104038
-DEAL::0.211325 0.211325 -0.211325 -0.104038
-DEAL::0.577350 -0.577350 0.577350 0.115757
-DEAL::0.577350 0.577350 0.577350 0.115757
-DEAL::0.211325 -0.211325 0.211325 -0.104038
-DEAL::0.211325 0.211325 0.211325 -0.104038
-DEAL::-0.577350 -0.577350 0.577350 0.115757
-DEAL::0.577350 -0.577350 0.577350 0.115757
-DEAL::-0.211325 -0.211325 0.211325 -0.104038
-DEAL::0.211325 -0.211325 0.211325 -0.104038
-DEAL::-0.577350 0.577350 0.577350 0.115757
-DEAL::0.577350 0.577350 0.577350 0.115757
-DEAL::-0.211325 0.211325 0.211325 -0.104038
-DEAL::0.211325 0.211325 0.211325 -0.104038
-DEAL::-0.577350 -0.577350 -0.577350 0.115757
-DEAL::-0.211325 -0.211325 -0.211325 -0.104038
-DEAL::-0.577350 0.577350 -0.577350 0.115757
-DEAL::-0.211325 0.211325 -0.211325 -0.104038
-DEAL::-0.577350 -0.577350 0.577350 0.115757
-DEAL::-0.211325 -0.211325 0.211325 -0.104038
-DEAL::-0.577350 0.577350 0.577350 0.115757
-DEAL::-0.211325 0.211325 0.211325 -0.104038
-DEAL::-0.577350 -0.577350 -0.577350 0.115757
-DEAL::0.577350 -0.577350 -0.577350 0.115757
-DEAL::-0.211325 -0.211325 -0.211325 -0.104038
-DEAL::0.211325 -0.211325 -0.211325 -0.104038
-DEAL::-0.577350 -0.577350 0.577350 0.115757
-DEAL::0.577350 -0.577350 0.577350 0.115757
-DEAL::-0.211325 -0.211325 0.211325 -0.104038
-DEAL::0.211325 -0.211325 0.211325 -0.104038
-DEAL::-0.577350 0.577350 -0.577350 0.115757
-DEAL::-0.211325 0.211325 -0.211325 -0.104038
-DEAL::0.577350 0.577350 -0.577350 0.115757
-DEAL::0.211325 0.211325 -0.211325 -0.104038
-DEAL::-0.577350 0.577350 0.577350 0.115757
-DEAL::-0.211325 0.211325 0.211325 -0.104038
-DEAL::0.577350 0.577350 0.577350 0.115757
-DEAL::0.211325 0.211325 0.211325 -0.104038
-DEAL::0.0709393
-DEAL::-0.211325 -0.211325 -0.211325 0.0250808
-DEAL::0.211325 -0.211325 -0.211325 0.0250808
-DEAL::-0.211325 0.211325 -0.211325 0.0250808
-DEAL::0.211325 0.211325 -0.211325 0.0250808
-DEAL::-0.211325 -0.211325 0.211325 0.0250808
-DEAL::0.211325 -0.211325 0.211325 0.0250808
-DEAL::-0.211325 0.211325 0.211325 0.0250808
-DEAL::0.211325 0.211325 0.211325 0.0250808
-DEAL::-0.577350 -0.577350 -0.577350 0
-DEAL::0.577350 -0.577350 -0.577350 0
-DEAL::-0.577350 0.577350 -0.577350 0
-DEAL::0.577350 0.577350 -0.577350 0
-DEAL::-0.211325 -0.211325 -0.211325 0.0250808
-DEAL::0.211325 -0.211325 -0.211325 0.0250808
-DEAL::-0.211325 0.211325 -0.211325 0.0250808
-DEAL::0.211325 0.211325 -0.211325 0.0250808
-DEAL::0.577350 -0.577350 -0.577350 0
-DEAL::0.577350 0.577350 -0.577350 0
-DEAL::0.211325 -0.211325 -0.211325 0.0250808
-DEAL::0.211325 0.211325 -0.211325 0.0250808
-DEAL::0.577350 -0.577350 0.577350 0
-DEAL::0.577350 0.577350 0.577350 0
-DEAL::0.211325 -0.211325 0.211325 0.0250808
-DEAL::0.211325 0.211325 0.211325 0.0250808
-DEAL::-0.577350 -0.577350 0.577350 0
-DEAL::0.577350 -0.577350 0.577350 0
-DEAL::-0.211325 -0.211325 0.211325 0.0250808
-DEAL::0.211325 -0.211325 0.211325 0.0250808
-DEAL::-0.577350 0.577350 0.577350 0
-DEAL::0.577350 0.577350 0.577350 0
-DEAL::-0.211325 0.211325 0.211325 0.0250808
-DEAL::0.211325 0.211325 0.211325 0.0250808
-DEAL::-0.577350 -0.577350 -0.577350 0
-DEAL::-0.211325 -0.211325 -0.211325 0.0250808
-DEAL::-0.577350 0.577350 -0.577350 0
-DEAL::-0.211325 0.211325 -0.211325 0.0250808
-DEAL::-0.577350 -0.577350 0.577350 0
-DEAL::-0.211325 -0.211325 0.211325 0.0250808
-DEAL::-0.577350 0.577350 0.577350 0
-DEAL::-0.211325 0.211325 0.211325 0.0250808
-DEAL::-0.577350 -0.577350 -0.577350 0
-DEAL::0.577350 -0.577350 -0.577350 0
-DEAL::-0.211325 -0.211325 -0.211325 0.0250808
-DEAL::0.211325 -0.211325 -0.211325 0.0250808
-DEAL::-0.577350 -0.577350 0.577350 0
-DEAL::0.577350 -0.577350 0.577350 0
-DEAL::-0.211325 -0.211325 0.211325 0.0250808
-DEAL::0.211325 -0.211325 0.211325 0.0250808
-DEAL::-0.577350 0.577350 -0.577350 0
-DEAL::-0.211325 0.211325 -0.211325 0.0250808
-DEAL::0.577350 0.577350 -0.577350 0
-DEAL::0.211325 0.211325 -0.211325 0.0250808
-DEAL::-0.577350 0.577350 0.577350 0
-DEAL::-0.211325 0.211325 0.211325 0.0250808
-DEAL::0.577350 0.577350 0.577350 0
-DEAL::0.211325 0.211325 0.211325 0.0250808
diff --git a/tests/hp/project_02/cmp/generic b/tests/hp/project_02/cmp/generic
deleted file mode 100644
index 8889fb7a29..0000000000
--- a/tests/hp/project_02/cmp/generic
+++ /dev/null
@@ -1,585 +0,0 @@
-
-DEAL::0.00000 0
-DEAL::0.250000 0.250000
-DEAL::0.250000 0.250000
-DEAL::0.500000 0.500000
-DEAL::0.500000 0.500000
-DEAL::0.750000 0.750000
-DEAL::0.750000 0.750000
-DEAL::1.00000 1.00000
-DEAL::0.00000 0.00000 0
-DEAL::0.250000 0.00000 0
-DEAL::0.00000 0.250000 0
-DEAL::0.250000 0.250000 0.0625000
-DEAL::0.250000 0.00000 0
-DEAL::0.500000 0.00000 0
-DEAL::0.250000 0.250000 0.0625000
-DEAL::0.500000 0.250000 0.125000
-DEAL::0.00000 0.250000 0
-DEAL::0.250000 0.250000 0.0625000
-DEAL::0.00000 0.500000 0
-DEAL::0.250000 0.500000 0.125000
-DEAL::0.250000 0.250000 0.0625000
-DEAL::0.500000 0.250000 0.125000
-DEAL::0.250000 0.500000 0.125000
-DEAL::0.500000 0.500000 0.250000
-DEAL::0.500000 0.00000 0
-DEAL::0.750000 0.00000 0
-DEAL::0.500000 0.250000 0.125000
-DEAL::0.750000 0.250000 0.187500
-DEAL::0.750000 0.00000 0
-DEAL::1.00000 0.00000 0
-DEAL::0.750000 0.250000 0.187500
-DEAL::1.00000 0.250000 0.250000
-DEAL::0.500000 0.250000 0.125000
-DEAL::0.750000 0.250000 0.187500
-DEAL::0.500000 0.500000 0.250000
-DEAL::0.750000 0.500000 0.375000
-DEAL::0.750000 0.250000 0.187500
-DEAL::1.00000 0.250000 0.250000
-DEAL::0.750000 0.500000 0.375000
-DEAL::1.00000 0.500000 0.500000
-DEAL::0.00000 0.500000 0
-DEAL::0.250000 0.500000 0.125000
-DEAL::0.00000 0.750000 0
-DEAL::0.250000 0.750000 0.187500
-DEAL::0.250000 0.500000 0.125000
-DEAL::0.500000 0.500000 0.250000
-DEAL::0.250000 0.750000 0.187500
-DEAL::0.500000 0.750000 0.375000
-DEAL::0.00000 0.750000 0
-DEAL::0.250000 0.750000 0.187500
-DEAL::0.00000 1.00000 0
-DEAL::0.250000 1.00000 0.250000
-DEAL::0.250000 0.750000 0.187500
-DEAL::0.500000 0.750000 0.375000
-DEAL::0.250000 1.00000 0.250000
-DEAL::0.500000 1.00000 0.500000
-DEAL::0.500000 0.500000 0.250000
-DEAL::0.750000 0.500000 0.375000
-DEAL::0.500000 0.750000 0.375000
-DEAL::0.750000 0.750000 0.562500
-DEAL::0.750000 0.500000 0.375000
-DEAL::1.00000 0.500000 0.500000
-DEAL::0.750000 0.750000 0.562500
-DEAL::1.00000 0.750000 0.750000
-DEAL::0.500000 0.750000 0.375000
-DEAL::0.750000 0.750000 0.562500
-DEAL::0.500000 1.00000 0.500000
-DEAL::0.750000 1.00000 0.750000
-DEAL::0.750000 0.750000 0.562500
-DEAL::1.00000 0.750000 0.750000
-DEAL::0.750000 1.00000 0.750000
-DEAL::1.00000 1.00000 1.00000
-DEAL::0.00000 0.00000 0.00000 0
-DEAL::0.250000 0.00000 0.00000 0
-DEAL::0.00000 0.250000 0.00000 0
-DEAL::0.250000 0.250000 0.00000 0
-DEAL::0.00000 0.00000 0.250000 0
-DEAL::0.250000 0.00000 0.250000 0
-DEAL::0.00000 0.250000 0.250000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.250000 0.00000 0.00000 0
-DEAL::0.500000 0.00000 0.00000 0
-DEAL::0.250000 0.250000 0.00000 0
-DEAL::0.500000 0.250000 0.00000 0
-DEAL::0.250000 0.00000 0.250000 0
-DEAL::0.500000 0.00000 0.250000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.00000 0.250000 0.00000 0
-DEAL::0.250000 0.250000 0.00000 0
-DEAL::0.00000 0.500000 0.00000 0
-DEAL::0.250000 0.500000 0.00000 0
-DEAL::0.00000 0.250000 0.250000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.00000 0.500000 0.250000 0
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.250000 0.250000 0.00000 0
-DEAL::0.500000 0.250000 0.00000 0
-DEAL::0.250000 0.500000 0.00000 0
-DEAL::0.500000 0.500000 0.00000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.00000 0.00000 0.250000 0
-DEAL::0.250000 0.00000 0.250000 0
-DEAL::0.00000 0.250000 0.250000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.00000 0.00000 0.500000 0
-DEAL::0.250000 0.00000 0.500000 0
-DEAL::0.00000 0.250000 0.500000 0
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.250000 0.00000 0.250000 0
-DEAL::0.500000 0.00000 0.250000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.250000 0.00000 0.500000 0
-DEAL::0.500000 0.00000 0.500000 0
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.00000 0.250000 0.250000 0
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.00000 0.500000 0.250000 0
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.00000 0.250000 0.500000 0
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.00000 0.500000 0.500000 0
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.250000 0.250000 0.250000 0.0156250
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.500000 0.00000 0.00000 0
-DEAL::0.750000 0.00000 0.00000 0
-DEAL::0.500000 0.250000 0.00000 0
-DEAL::0.750000 0.250000 0.00000 0
-DEAL::0.500000 0.00000 0.250000 0
-DEAL::0.750000 0.00000 0.250000 0
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::0.750000 0.00000 0.00000 0
-DEAL::1.00000 0.00000 0.00000 0
-DEAL::0.750000 0.250000 0.00000 0
-DEAL::1.00000 0.250000 0.00000 0
-DEAL::0.750000 0.00000 0.250000 0
-DEAL::1.00000 0.00000 0.250000 0
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::1.00000 0.250000 0.250000 0.0625000
-DEAL::0.500000 0.250000 0.00000 0
-DEAL::0.750000 0.250000 0.00000 0
-DEAL::0.500000 0.500000 0.00000 0
-DEAL::0.750000 0.500000 0.00000 0
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::0.750000 0.250000 0.00000 0
-DEAL::1.00000 0.250000 0.00000 0
-DEAL::0.750000 0.500000 0.00000 0
-DEAL::1.00000 0.500000 0.00000 0
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::1.00000 0.250000 0.250000 0.0625000
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::1.00000 0.500000 0.250000 0.125000
-DEAL::0.500000 0.00000 0.250000 0
-DEAL::0.750000 0.00000 0.250000 0
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::0.500000 0.00000 0.500000 0
-DEAL::0.750000 0.00000 0.500000 0
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::0.750000 0.00000 0.250000 0
-DEAL::1.00000 0.00000 0.250000 0
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::1.00000 0.250000 0.250000 0.0625000
-DEAL::0.750000 0.00000 0.500000 0
-DEAL::1.00000 0.00000 0.500000 0
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::1.00000 0.250000 0.500000 0.125000
-DEAL::0.500000 0.250000 0.250000 0.0312500
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::0.750000 0.250000 0.250000 0.0468750
-DEAL::1.00000 0.250000 0.250000 0.0625000
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::1.00000 0.500000 0.250000 0.125000
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::1.00000 0.250000 0.500000 0.125000
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::1.00000 0.500000 0.500000 0.250000
-DEAL::0.00000 0.500000 0.00000 0
-DEAL::0.250000 0.500000 0.00000 0
-DEAL::0.00000 0.750000 0.00000 0
-DEAL::0.250000 0.750000 0.00000 0
-DEAL::0.00000 0.500000 0.250000 0
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.00000 0.750000 0.250000 0
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.250000 0.500000 0.00000 0
-DEAL::0.500000 0.500000 0.00000 0
-DEAL::0.250000 0.750000 0.00000 0
-DEAL::0.500000 0.750000 0.00000 0
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.00000 0.750000 0.00000 0
-DEAL::0.250000 0.750000 0.00000 0
-DEAL::0.00000 1.00000 0.00000 0
-DEAL::0.250000 1.00000 0.00000 0
-DEAL::0.00000 0.750000 0.250000 0
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.00000 1.00000 0.250000 0
-DEAL::0.250000 1.00000 0.250000 0.0625000
-DEAL::0.250000 0.750000 0.00000 0
-DEAL::0.500000 0.750000 0.00000 0
-DEAL::0.250000 1.00000 0.00000 0
-DEAL::0.500000 1.00000 0.00000 0
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.250000 1.00000 0.250000 0.0625000
-DEAL::0.500000 1.00000 0.250000 0.125000
-DEAL::0.00000 0.500000 0.250000 0
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.00000 0.750000 0.250000 0
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.00000 0.500000 0.500000 0
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.00000 0.750000 0.500000 0
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.250000 0.500000 0.250000 0.0312500
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.00000 0.750000 0.250000 0
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.00000 1.00000 0.250000 0
-DEAL::0.250000 1.00000 0.250000 0.0625000
-DEAL::0.00000 0.750000 0.500000 0
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.00000 1.00000 0.500000 0
-DEAL::0.250000 1.00000 0.500000 0.125000
-DEAL::0.250000 0.750000 0.250000 0.0468750
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.250000 1.00000 0.250000 0.0625000
-DEAL::0.500000 1.00000 0.250000 0.125000
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.250000 1.00000 0.500000 0.125000
-DEAL::0.500000 1.00000 0.500000 0.250000
-DEAL::0.500000 0.500000 0.00000 0
-DEAL::0.750000 0.500000 0.00000 0
-DEAL::0.500000 0.750000 0.00000 0
-DEAL::0.750000 0.750000 0.00000 0
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::0.750000 0.500000 0.00000 0
-DEAL::1.00000 0.500000 0.00000 0
-DEAL::0.750000 0.750000 0.00000 0
-DEAL::1.00000 0.750000 0.00000 0
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::1.00000 0.500000 0.250000 0.125000
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::1.00000 0.750000 0.250000 0.187500
-DEAL::0.500000 0.750000 0.00000 0
-DEAL::0.750000 0.750000 0.00000 0
-DEAL::0.500000 1.00000 0.00000 0
-DEAL::0.750000 1.00000 0.00000 0
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::0.500000 1.00000 0.250000 0.125000
-DEAL::0.750000 1.00000 0.250000 0.187500
-DEAL::0.750000 0.750000 0.00000 0
-DEAL::1.00000 0.750000 0.00000 0
-DEAL::0.750000 1.00000 0.00000 0
-DEAL::1.00000 1.00000 0.00000 0
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::1.00000 0.750000 0.250000 0.187500
-DEAL::0.750000 1.00000 0.250000 0.187500
-DEAL::1.00000 1.00000 0.250000 0.250000
-DEAL::0.500000 0.500000 0.250000 0.0625000
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::0.750000 0.500000 0.250000 0.0937500
-DEAL::1.00000 0.500000 0.250000 0.125000
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::1.00000 0.750000 0.250000 0.187500
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::1.00000 0.500000 0.500000 0.250000
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::1.00000 0.750000 0.500000 0.375000
-DEAL::0.500000 0.750000 0.250000 0.0937500
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::0.500000 1.00000 0.250000 0.125000
-DEAL::0.750000 1.00000 0.250000 0.187500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::0.500000 1.00000 0.500000 0.250000
-DEAL::0.750000 1.00000 0.500000 0.375000
-DEAL::0.750000 0.750000 0.250000 0.140625
-DEAL::1.00000 0.750000 0.250000 0.187500
-DEAL::0.750000 1.00000 0.250000 0.187500
-DEAL::1.00000 1.00000 0.250000 0.250000
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::1.00000 0.750000 0.500000 0.375000
-DEAL::0.750000 1.00000 0.500000 0.375000
-DEAL::1.00000 1.00000 0.500000 0.500000
-DEAL::0.00000 0.00000 0.500000 0
-DEAL::0.250000 0.00000 0.500000 0
-DEAL::0.00000 0.250000 0.500000 0
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.00000 0.00000 0.750000 0
-DEAL::0.250000 0.00000 0.750000 0
-DEAL::0.00000 0.250000 0.750000 0
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.250000 0.00000 0.500000 0
-DEAL::0.500000 0.00000 0.500000 0
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.250000 0.00000 0.750000 0
-DEAL::0.500000 0.00000 0.750000 0
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.00000 0.250000 0.500000 0
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.00000 0.500000 0.500000 0
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.00000 0.250000 0.750000 0
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.00000 0.500000 0.750000 0
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.250000 0.250000 0.500000 0.0312500
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.00000 0.00000 0.750000 0
-DEAL::0.250000 0.00000 0.750000 0
-DEAL::0.00000 0.250000 0.750000 0
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.00000 0.00000 1.00000 0
-DEAL::0.250000 0.00000 1.00000 0
-DEAL::0.00000 0.250000 1.00000 0
-DEAL::0.250000 0.250000 1.00000 0.0625000
-DEAL::0.250000 0.00000 0.750000 0
-DEAL::0.500000 0.00000 0.750000 0
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.250000 0.00000 1.00000 0
-DEAL::0.500000 0.00000 1.00000 0
-DEAL::0.250000 0.250000 1.00000 0.0625000
-DEAL::0.500000 0.250000 1.00000 0.125000
-DEAL::0.00000 0.250000 0.750000 0
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.00000 0.500000 0.750000 0
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.00000 0.250000 1.00000 0
-DEAL::0.250000 0.250000 1.00000 0.0625000
-DEAL::0.00000 0.500000 1.00000 0
-DEAL::0.250000 0.500000 1.00000 0.125000
-DEAL::0.250000 0.250000 0.750000 0.0468750
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.250000 0.250000 1.00000 0.0625000
-DEAL::0.500000 0.250000 1.00000 0.125000
-DEAL::0.250000 0.500000 1.00000 0.125000
-DEAL::0.500000 0.500000 1.00000 0.250000
-DEAL::0.500000 0.00000 0.500000 0
-DEAL::0.750000 0.00000 0.500000 0
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::0.500000 0.00000 0.750000 0
-DEAL::0.750000 0.00000 0.750000 0
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::0.750000 0.00000 0.500000 0
-DEAL::1.00000 0.00000 0.500000 0
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::1.00000 0.250000 0.500000 0.125000
-DEAL::0.750000 0.00000 0.750000 0
-DEAL::1.00000 0.00000 0.750000 0
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::1.00000 0.250000 0.750000 0.187500
-DEAL::0.500000 0.250000 0.500000 0.0625000
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::0.750000 0.250000 0.500000 0.0937500
-DEAL::1.00000 0.250000 0.500000 0.125000
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::1.00000 0.500000 0.500000 0.250000
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::1.00000 0.250000 0.750000 0.187500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::1.00000 0.500000 0.750000 0.375000
-DEAL::0.500000 0.00000 0.750000 0
-DEAL::0.750000 0.00000 0.750000 0
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::0.500000 0.00000 1.00000 0
-DEAL::0.750000 0.00000 1.00000 0
-DEAL::0.500000 0.250000 1.00000 0.125000
-DEAL::0.750000 0.250000 1.00000 0.187500
-DEAL::0.750000 0.00000 0.750000 0
-DEAL::1.00000 0.00000 0.750000 0
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::1.00000 0.250000 0.750000 0.187500
-DEAL::0.750000 0.00000 1.00000 0
-DEAL::1.00000 0.00000 1.00000 0
-DEAL::0.750000 0.250000 1.00000 0.187500
-DEAL::1.00000 0.250000 1.00000 0.250000
-DEAL::0.500000 0.250000 0.750000 0.0937500
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::0.500000 0.250000 1.00000 0.125000
-DEAL::0.750000 0.250000 1.00000 0.187500
-DEAL::0.500000 0.500000 1.00000 0.250000
-DEAL::0.750000 0.500000 1.00000 0.375000
-DEAL::0.750000 0.250000 0.750000 0.140625
-DEAL::1.00000 0.250000 0.750000 0.187500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::1.00000 0.500000 0.750000 0.375000
-DEAL::0.750000 0.250000 1.00000 0.187500
-DEAL::1.00000 0.250000 1.00000 0.250000
-DEAL::0.750000 0.500000 1.00000 0.375000
-DEAL::1.00000 0.500000 1.00000 0.500000
-DEAL::0.00000 0.500000 0.500000 0
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.00000 0.750000 0.500000 0
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.00000 0.500000 0.750000 0
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.00000 0.750000 0.750000 0
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.250000 0.500000 0.500000 0.0625000
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.00000 0.750000 0.500000 0
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.00000 1.00000 0.500000 0
-DEAL::0.250000 1.00000 0.500000 0.125000
-DEAL::0.00000 0.750000 0.750000 0
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.00000 1.00000 0.750000 0
-DEAL::0.250000 1.00000 0.750000 0.187500
-DEAL::0.250000 0.750000 0.500000 0.0937500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.250000 1.00000 0.500000 0.125000
-DEAL::0.500000 1.00000 0.500000 0.250000
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.250000 1.00000 0.750000 0.187500
-DEAL::0.500000 1.00000 0.750000 0.375000
-DEAL::0.00000 0.500000 0.750000 0
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.00000 0.750000 0.750000 0
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.00000 0.500000 1.00000 0
-DEAL::0.250000 0.500000 1.00000 0.125000
-DEAL::0.00000 0.750000 1.00000 0
-DEAL::0.250000 0.750000 1.00000 0.187500
-DEAL::0.250000 0.500000 0.750000 0.0937500
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.250000 0.500000 1.00000 0.125000
-DEAL::0.500000 0.500000 1.00000 0.250000
-DEAL::0.250000 0.750000 1.00000 0.187500
-DEAL::0.500000 0.750000 1.00000 0.375000
-DEAL::0.00000 0.750000 0.750000 0
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.00000 1.00000 0.750000 0
-DEAL::0.250000 1.00000 0.750000 0.187500
-DEAL::0.00000 0.750000 1.00000 0
-DEAL::0.250000 0.750000 1.00000 0.187500
-DEAL::0.00000 1.00000 1.00000 0
-DEAL::0.250000 1.00000 1.00000 0.250000
-DEAL::0.250000 0.750000 0.750000 0.140625
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.250000 1.00000 0.750000 0.187500
-DEAL::0.500000 1.00000 0.750000 0.375000
-DEAL::0.250000 0.750000 1.00000 0.187500
-DEAL::0.500000 0.750000 1.00000 0.375000
-DEAL::0.250000 1.00000 1.00000 0.250000
-DEAL::0.500000 1.00000 1.00000 0.500000
-DEAL::0.500000 0.500000 0.500000 0.125000
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::0.750000 0.500000 0.500000 0.187500
-DEAL::1.00000 0.500000 0.500000 0.250000
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::1.00000 0.750000 0.500000 0.375000
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::1.00000 0.500000 0.750000 0.375000
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::1.00000 0.750000 0.750000 0.562500
-DEAL::0.500000 0.750000 0.500000 0.187500
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::0.500000 1.00000 0.500000 0.250000
-DEAL::0.750000 1.00000 0.500000 0.375000
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::0.500000 1.00000 0.750000 0.375000
-DEAL::0.750000 1.00000 0.750000 0.562500
-DEAL::0.750000 0.750000 0.500000 0.281250
-DEAL::1.00000 0.750000 0.500000 0.375000
-DEAL::0.750000 1.00000 0.500000 0.375000
-DEAL::1.00000 1.00000 0.500000 0.500000
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::1.00000 0.750000 0.750000 0.562500
-DEAL::0.750000 1.00000 0.750000 0.562500
-DEAL::1.00000 1.00000 0.750000 0.750000
-DEAL::0.500000 0.500000 0.750000 0.187500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::0.500000 0.500000 1.00000 0.250000
-DEAL::0.750000 0.500000 1.00000 0.375000
-DEAL::0.500000 0.750000 1.00000 0.375000
-DEAL::0.750000 0.750000 1.00000 0.562500
-DEAL::0.750000 0.500000 0.750000 0.281250
-DEAL::1.00000 0.500000 0.750000 0.375000
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::1.00000 0.750000 0.750000 0.562500
-DEAL::0.750000 0.500000 1.00000 0.375000
-DEAL::1.00000 0.500000 1.00000 0.500000
-DEAL::0.750000 0.750000 1.00000 0.562500
-DEAL::1.00000 0.750000 1.00000 0.750000
-DEAL::0.500000 0.750000 0.750000 0.281250
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::0.500000 1.00000 0.750000 0.375000
-DEAL::0.750000 1.00000 0.750000 0.562500
-DEAL::0.500000 0.750000 1.00000 0.375000
-DEAL::0.750000 0.750000 1.00000 0.562500
-DEAL::0.500000 1.00000 1.00000 0.500000
-DEAL::0.750000 1.00000 1.00000 0.750000
-DEAL::0.750000 0.750000 0.750000 0.421875
-DEAL::1.00000 0.750000 0.750000 0.562500
-DEAL::0.750000 1.00000 0.750000 0.562500
-DEAL::1.00000 1.00000 0.750000 0.750000
-DEAL::0.750000 0.750000 1.00000 0.562500
-DEAL::1.00000 0.750000 1.00000 0.750000
-DEAL::0.750000 1.00000 1.00000 0.750000
-DEAL::1.00000 1.00000 1.00000 1.00000
diff --git a/tests/hp/step-5.cc b/tests/hp/step-5.cc
index 6ba3fe9034..3bff1ee618 100644
--- a/tests/hp/step-5.cc
+++ b/tests/hp/step-5.cc
@@ -299,7 +299,7 @@ void LaplaceProblem<dim>::run ()
         {
           GridIn<dim> grid_in;
           grid_in.attach_triangulation (triangulation);
-          std::ifstream input_file(SOURCE_DIR "/step-5/circle-grid.inp");
+          std::ifstream input_file(SOURCE_DIR "/grids/circle-grid.inp");
           Assert (dim==2, ExcInternalError());
 
           grid_in.read_ucd (input_file);
diff --git a/tests/hsl/Makefile b/tests/hsl/Makefile
deleted file mode 100644
index 3dc8d027c4..0000000000
--- a/tests/hsl/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-############################################################
-# Makefile,v 1.15 2002/06/13 12:51:13 hartmann Exp
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors
-############################################################
-
-include ../Makefile.paths
-include $D/common/Make.global_options
-include ../Makefile.rules
--include Makefile.depend
--include Makefile.tests
diff --git a/tests/hsl/hsl_ma27_01.cc b/tests/hsl/hsl_ma27_01.cc
deleted file mode 100644
index 4b42229c2d..0000000000
--- a/tests/hsl/hsl_ma27_01.cc
+++ /dev/null
@@ -1,119 +0,0 @@
-// ---------------------------------------------------------------------
-// $Id$
-//
-// Copyright (C) 2002 - 2013 by the deal.II authors
-//
-// This file is part of the deal.II library.
-//
-// The deal.II library is free software; you can use it, redistribute
-// it, and/or modify it under the terms of the GNU Lesser General
-// Public License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-// The full text of the license can be found in the file LICENSE at
-// the top level of the deal.II distribution.
-//
-// ---------------------------------------------------------------------
-
-
-// test the hsl_ma27 sparse direct solver on a mass matrix
-
-#include "../tests.h"
-#include <iomanip>
-#include <fstream>
-#include <cstdlib>
-
-#include <deal.II/base/quadrature_lib.h>
-#include <deal.II/base/function.h>
-
-#include <deal.II/fe/fe_q.h>
-#include <deal.II/fe/fe_values.h>
-
-#include <deal.II/dofs/dof_tools.h>
-
-#include <deal.II/lac/sparse_matrix.h>
-#include <deal.II/lac/sparsity_pattern.h>
-#include <deal.II/lac/vector.h>
-#include <deal.II/lac/sparse_direct.h>
-
-#include <deal.II/grid/tria.h>
-#include <deal.II/grid/grid_generator.h>
-
-#include <deal.II/numerics/vector_tools.h>
-#include <deal.II/numerics/matrix_tools.h>
-
-
-
-template <int dim>
-void test ()
-{
-  deallog << dim << 'd' << std::endl;
-
-  Triangulation<dim> tria;
-  GridGenerator::hyper_cube (tria,0,1);
-  tria.refine_global (1);
-
-  // destroy the uniformity of the matrix by
-  // refining one cell
-  tria.begin_active()->set_refine_flag ();
-  tria.execute_coarsening_and_refinement ();
-  tria.refine_global(8-2*dim);
-
-  FE_Q<dim> fe (1);
-  DoFHandler<dim> dof_handler (tria);
-  dof_handler.distribute_dofs (fe);
-
-  deallog << "Number of dofs = " << dof_handler.n_dofs() << std::endl;
-
-  SparsityPattern sparsity_pattern;
-  sparsity_pattern.reinit (dof_handler.n_dofs(),
-                           dof_handler.n_dofs(),
-                           dof_handler.max_couplings_between_dofs());
-  DoFTools::make_sparsity_pattern (dof_handler, sparsity_pattern);
-  sparsity_pattern.compress ();
-
-  SparseMatrix<double> B;
-  B.reinit (sparsity_pattern);
-
-  QGauss<dim> qr (2);
-  MatrixTools::create_mass_matrix (dof_handler, qr, B);
-
-  // for a number of different solution
-  // vectors, make up a matching rhs vector
-  // and check what the MA27 solver finds
-  for (unsigned int i=0; i<3; ++i)
-    {
-      Vector<double> solution (dof_handler.n_dofs());
-      Vector<double> x (dof_handler.n_dofs());
-      Vector<double> b (dof_handler.n_dofs());
-
-      for (unsigned int j=0; j<dof_handler.n_dofs(); ++j)
-        solution(j) = j+j*(i+1)*(i+1);
-
-      B.vmult (b, solution);
-      x = b;
-      SparseDirectMA27().solve (B, x);
-
-      x -= solution;
-      deallog << "relative norm distance = "
-              << x.l2_norm() / solution.l2_norm()
-              << std::endl;
-      deallog << "absolute norms = "
-              << x.l2_norm() << ' ' << solution.l2_norm()
-              << std::endl;
-      Assert (x.l2_norm() / solution.l2_norm() < 1e-8,
-              ExcInternalError());
-    }
-}
-
-
-int main ()
-{
-  std::ofstream logfile("hsl_ma27_01/output");
-  deallog.attach(logfile);
-  deallog.depth_console(0);
-  deallog.threshold_double(1.e-8);
-
-  test<1> ();
-  test<2> ();
-  test<3> ();
-}
diff --git a/tests/hsl/hsl_ma27_01/cmp/generic b/tests/hsl/hsl_ma27_01/cmp/generic
deleted file mode 100644
index 75a3a30a0d..0000000000
--- a/tests/hsl/hsl_ma27_01/cmp/generic
+++ /dev/null
@@ -1,25 +0,0 @@
-
-DEAL::1d
-DEAL::Number of dofs = 193
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 3084.00
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 7709.99
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 15420.0
-DEAL::2d
-DEAL::Number of dofs = 1889
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 94764.3
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 1.25281e-10 236911.
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 2.50563e-10 473822.
-DEAL::3d
-DEAL::Number of dofs = 1333
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 56165.6
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 1.96833e-10 140414.
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 3.93667e-10 280828.
diff --git a/tests/hsl/hsl_ma27_02.cc b/tests/hsl/hsl_ma27_02.cc
deleted file mode 100644
index 340741c8f6..0000000000
--- a/tests/hsl/hsl_ma27_02.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-// ---------------------------------------------------------------------
-// $Id$
-//
-// Copyright (C) 2002 - 2013 by the deal.II authors
-//
-// This file is part of the deal.II library.
-//
-// The deal.II library is free software; you can use it, redistribute
-// it, and/or modify it under the terms of the GNU Lesser General
-// Public License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-// The full text of the license can be found in the file LICENSE at
-// the top level of the deal.II distribution.
-//
-// ---------------------------------------------------------------------
-
-
-// test the hsl_ma27 sparse direct solver on a mass matrix; test that the
-// functions that allow for repeated solves yield the correct result even
-// though the matrix is decomposed only once
-
-#include "../tests.h"
-#include <iomanip>
-#include <fstream>
-#include <cstdlib>
-
-#include <deal.II/base/quadrature_lib.h>
-#include <deal.II/base/function.h>
-
-#include <deal.II/fe/fe_q.h>
-#include <deal.II/fe/fe_values.h>
-
-#include <deal.II/dofs/dof_tools.h>
-
-#include <deal.II/lac/sparse_matrix.h>
-#include <deal.II/lac/sparsity_pattern.h>
-#include <deal.II/lac/vector.h>
-#include <deal.II/lac/sparse_direct.h>
-
-#include <deal.II/grid/tria.h>
-#include <deal.II/grid/grid_generator.h>
-
-#include <deal.II/numerics/vector_tools.h>
-#include <deal.II/numerics/matrix_tools.h>
-
-
-
-template <int dim>
-void test ()
-{
-  deallog << dim << 'd' << std::endl;
-
-  Triangulation<dim> tria;
-  GridGenerator::hyper_cube (tria,0,1);
-  tria.refine_global (1);
-
-  // destroy the uniformity of the matrix by
-  // refining one cell
-  tria.begin_active()->set_refine_flag ();
-  tria.execute_coarsening_and_refinement ();
-  tria.refine_global(8-2*dim);
-
-  FE_Q<dim> fe (1);
-  DoFHandler<dim> dof_handler (tria);
-  dof_handler.distribute_dofs (fe);
-
-  deallog << "Number of dofs = " << dof_handler.n_dofs() << std::endl;
-
-  SparsityPattern sparsity_pattern;
-  sparsity_pattern.reinit (dof_handler.n_dofs(),
-                           dof_handler.n_dofs(),
-                           dof_handler.max_couplings_between_dofs());
-  DoFTools::make_sparsity_pattern (dof_handler, sparsity_pattern);
-  sparsity_pattern.compress ();
-
-  SparseMatrix<double> B;
-  B.reinit (sparsity_pattern);
-
-  QGauss<dim> qr (2);
-  MatrixTools::create_mass_matrix (dof_handler, qr, B);
-
-  // compute a decomposition of the matrix
-  SparseDirectMA27 Binv;
-  Binv.factorize (B);
-
-  // for a number of different solution
-  // vectors, make up a matching rhs vector
-  // and check what the MA27 solver finds
-  for (unsigned int i=0; i<3; ++i)
-    {
-      Vector<double> solution (dof_handler.n_dofs());
-      Vector<double> x (dof_handler.n_dofs());
-      Vector<double> b (dof_handler.n_dofs());
-
-      for (unsigned int j=0; j<dof_handler.n_dofs(); ++j)
-        solution(j) = j+j*(i+1)*(i+1);
-
-      B.vmult (b, solution);
-      x = b;
-      Binv.solve (x);
-
-      x -= solution;
-      deallog << "relative norm distance = "
-              << x.l2_norm() / solution.l2_norm()
-              << std::endl;
-      deallog << "absolute norms = "
-              << x.l2_norm() << ' ' << solution.l2_norm()
-              << std::endl;
-      Assert (x.l2_norm() / solution.l2_norm() < 1e-8,
-              ExcInternalError());
-    }
-}
-
-
-int main ()
-{
-  std::ofstream logfile("hsl_ma27_02/output");
-  deallog.attach(logfile);
-  deallog.depth_console(0);
-  deallog.threshold_double(1.e-8);
-
-  test<1> ();
-  test<2> ();
-  test<3> ();
-}
diff --git a/tests/hsl/hsl_ma27_02/cmp/generic b/tests/hsl/hsl_ma27_02/cmp/generic
deleted file mode 100644
index 75a3a30a0d..0000000000
--- a/tests/hsl/hsl_ma27_02/cmp/generic
+++ /dev/null
@@ -1,25 +0,0 @@
-
-DEAL::1d
-DEAL::Number of dofs = 193
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 3084.00
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 7709.99
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 15420.0
-DEAL::2d
-DEAL::Number of dofs = 1889
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 94764.3
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 1.25281e-10 236911.
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 2.50563e-10 473822.
-DEAL::3d
-DEAL::Number of dofs = 1333
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 56165.6
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 1.96833e-10 140414.
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 3.93667e-10 280828.
diff --git a/tests/hsl/hsl_ma47_01.cc b/tests/hsl/hsl_ma47_01.cc
deleted file mode 100644
index 818dae45fc..0000000000
--- a/tests/hsl/hsl_ma47_01.cc
+++ /dev/null
@@ -1,119 +0,0 @@
-// ---------------------------------------------------------------------
-// $Id$
-//
-// Copyright (C) 2002 - 2013 by the deal.II authors
-//
-// This file is part of the deal.II library.
-//
-// The deal.II library is free software; you can use it, redistribute
-// it, and/or modify it under the terms of the GNU Lesser General
-// Public License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-// The full text of the license can be found in the file LICENSE at
-// the top level of the deal.II distribution.
-//
-// ---------------------------------------------------------------------
-
-
-// test the hsl_ma47 sparse direct solver on a mass matrix
-
-#include "../tests.h"
-#include <iomanip>
-#include <fstream>
-#include <cstdlib>
-
-#include <deal.II/base/quadrature_lib.h>
-#include <deal.II/base/function.h>
-
-#include <deal.II/fe/fe_q.h>
-#include <deal.II/fe/fe_values.h>
-
-#include <deal.II/dofs/dof_tools.h>
-
-#include <deal.II/lac/sparse_matrix.h>
-#include <deal.II/lac/sparsity_pattern.h>
-#include <deal.II/lac/vector.h>
-#include <deal.II/lac/sparse_direct.h>
-
-#include <deal.II/grid/tria.h>
-#include <deal.II/grid/grid_generator.h>
-
-#include <deal.II/numerics/vector_tools.h>
-#include <deal.II/numerics/matrix_tools.h>
-
-
-
-template <int dim>
-void test ()
-{
-  deallog << dim << 'd' << std::endl;
-
-  Triangulation<dim> tria;
-  GridGenerator::hyper_cube (tria,0,1);
-  tria.refine_global (1);
-
-  // destroy the uniformity of the matrix by
-  // refining one cell
-  tria.begin_active()->set_refine_flag ();
-  tria.execute_coarsening_and_refinement ();
-  tria.refine_global(8-2*dim);
-
-  FE_Q<dim> fe (1);
-  DoFHandler<dim> dof_handler (tria);
-  dof_handler.distribute_dofs (fe);
-
-  deallog << "Number of dofs = " << dof_handler.n_dofs() << std::endl;
-
-  SparsityPattern sparsity_pattern;
-  sparsity_pattern.reinit (dof_handler.n_dofs(),
-                           dof_handler.n_dofs(),
-                           dof_handler.max_couplings_between_dofs());
-  DoFTools::make_sparsity_pattern (dof_handler, sparsity_pattern);
-  sparsity_pattern.compress ();
-
-  SparseMatrix<double> B;
-  B.reinit (sparsity_pattern);
-
-  QGauss<dim> qr (2);
-  MatrixTools::create_mass_matrix (dof_handler, qr, B);
-
-  // for a number of different solution
-  // vectors, make up a matching rhs vector
-  // and check what the MA47 solver finds
-  for (unsigned int i=0; i<3; ++i)
-    {
-      Vector<double> solution (dof_handler.n_dofs());
-      Vector<double> x (dof_handler.n_dofs());
-      Vector<double> b (dof_handler.n_dofs());
-
-      for (unsigned int j=0; j<dof_handler.n_dofs(); ++j)
-        solution(j) = j+j*(i+1)*(i+1);
-
-      B.vmult (b, solution);
-      x = b;
-      SparseDirectMA47().solve (B, x);
-
-      x -= solution;
-      deallog << "relative norm distance = "
-              << x.l2_norm() / solution.l2_norm()
-              << std::endl;
-      deallog << "absolute norms = "
-              << x.l2_norm() << ' ' << solution.l2_norm()
-              << std::endl;
-      Assert (x.l2_norm() / solution.l2_norm() < 1e-8,
-              ExcInternalError());
-    }
-}
-
-
-int main ()
-{
-  std::ofstream logfile("hsl_ma47_01/output");
-  deallog.attach(logfile);
-  deallog.depth_console(0);
-  deallog.threshold_double(1.e-8);
-
-  test<1> ();
-  test<2> ();
-  test<3> ();
-}
diff --git a/tests/hsl/hsl_ma47_01/cmp/generic b/tests/hsl/hsl_ma47_01/cmp/generic
deleted file mode 100644
index ac1fa589a6..0000000000
--- a/tests/hsl/hsl_ma47_01/cmp/generic
+++ /dev/null
@@ -1,25 +0,0 @@
-
-DEAL::1d
-DEAL::Number of dofs = 193
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 3084.00
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 7709.99
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 15420.0
-DEAL::2d
-DEAL::Number of dofs = 1889
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 94764.3
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 1.32980e-10 236911.
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 2.65960e-10 473822.
-DEAL::3d
-DEAL::Number of dofs = 1333
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 56165.6
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 2.16841e-10 140414.
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 4.33683e-10 280828.
diff --git a/tests/hsl/hsl_ma47_02.cc b/tests/hsl/hsl_ma47_02.cc
deleted file mode 100644
index 633cc60178..0000000000
--- a/tests/hsl/hsl_ma47_02.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-// ---------------------------------------------------------------------
-// $Id$
-//
-// Copyright (C) 2002 - 2013 by the deal.II authors
-//
-// This file is part of the deal.II library.
-//
-// The deal.II library is free software; you can use it, redistribute
-// it, and/or modify it under the terms of the GNU Lesser General
-// Public License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-// The full text of the license can be found in the file LICENSE at
-// the top level of the deal.II distribution.
-//
-// ---------------------------------------------------------------------
-
-
-// test the hsl_ma47 sparse direct solver on a mass matrix; test that the
-// functions that allow for repeated solves yield the correct result even
-// though the matrix is decomposed only once
-
-#include "../tests.h"
-#include <iomanip>
-#include <fstream>
-#include <cstdlib>
-
-#include <deal.II/base/quadrature_lib.h>
-#include <deal.II/base/function.h>
-
-#include <deal.II/fe/fe_q.h>
-#include <deal.II/fe/fe_values.h>
-
-#include <deal.II/dofs/dof_tools.h>
-
-#include <deal.II/lac/sparse_matrix.h>
-#include <deal.II/lac/sparsity_pattern.h>
-#include <deal.II/lac/vector.h>
-#include <deal.II/lac/sparse_direct.h>
-
-#include <deal.II/grid/tria.h>
-#include <deal.II/grid/grid_generator.h>
-
-#include <deal.II/numerics/vector_tools.h>
-#include <deal.II/numerics/matrix_tools.h>
-
-
-
-template <int dim>
-void test ()
-{
-  deallog << dim << 'd' << std::endl;
-
-  Triangulation<dim> tria;
-  GridGenerator::hyper_cube (tria,0,1);
-  tria.refine_global (1);
-
-  // destroy the uniformity of the matrix by
-  // refining one cell
-  tria.begin_active()->set_refine_flag ();
-  tria.execute_coarsening_and_refinement ();
-  tria.refine_global(8-2*dim);
-
-  FE_Q<dim> fe (1);
-  DoFHandler<dim> dof_handler (tria);
-  dof_handler.distribute_dofs (fe);
-
-  deallog << "Number of dofs = " << dof_handler.n_dofs() << std::endl;
-
-  SparsityPattern sparsity_pattern;
-  sparsity_pattern.reinit (dof_handler.n_dofs(),
-                           dof_handler.n_dofs(),
-                           dof_handler.max_couplings_between_dofs());
-  DoFTools::make_sparsity_pattern (dof_handler, sparsity_pattern);
-  sparsity_pattern.compress ();
-
-  SparseMatrix<double> B;
-  B.reinit (sparsity_pattern);
-
-  QGauss<dim> qr (2);
-  MatrixTools::create_mass_matrix (dof_handler, qr, B);
-
-  // compute a decomposition of the matrix
-  SparseDirectMA47 Binv;
-  Binv.factorize (B);
-
-  // for a number of different solution
-  // vectors, make up a matching rhs vector
-  // and check what the MA47 solver finds
-  for (unsigned int i=0; i<3; ++i)
-    {
-      Vector<double> solution (dof_handler.n_dofs());
-      Vector<double> x (dof_handler.n_dofs());
-      Vector<double> b (dof_handler.n_dofs());
-
-      for (unsigned int j=0; j<dof_handler.n_dofs(); ++j)
-        solution(j) = j+j*(i+1)*(i+1);
-
-      B.vmult (b, solution);
-      x = b;
-      Binv.solve (x);
-
-      x -= solution;
-      deallog << "relative norm distance = "
-              << x.l2_norm() / solution.l2_norm()
-              << std::endl;
-      deallog << "absolute norms = "
-              << x.l2_norm() << ' ' << solution.l2_norm()
-              << std::endl;
-      Assert (x.l2_norm() / solution.l2_norm() < 1e-8,
-              ExcInternalError());
-    }
-}
-
-
-int main ()
-{
-  std::ofstream logfile("hsl_ma47_02/output");
-  deallog.attach(logfile);
-  deallog.depth_console(0);
-  deallog.threshold_double(1.e-8);
-
-  test<1> ();
-  test<2> ();
-  test<3> ();
-}
diff --git a/tests/hsl/hsl_ma47_02/cmp/generic b/tests/hsl/hsl_ma47_02/cmp/generic
deleted file mode 100644
index ac1fa589a6..0000000000
--- a/tests/hsl/hsl_ma47_02/cmp/generic
+++ /dev/null
@@ -1,25 +0,0 @@
-
-DEAL::1d
-DEAL::Number of dofs = 193
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 3084.00
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 7709.99
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 15420.0
-DEAL::2d
-DEAL::Number of dofs = 1889
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 94764.3
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 1.32980e-10 236911.
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 2.65960e-10 473822.
-DEAL::3d
-DEAL::Number of dofs = 1333
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 0 56165.6
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 2.16841e-10 140414.
-DEAL::relative norm distance = 0
-DEAL::absolute norms = 4.33683e-10 280828.