From: Luca Heltai <luca.heltai@sissa.it>
Date: Tue, 17 Apr 2018 08:22:29 +0000 (+0200)
Subject: Fix tests.
X-Git-Tag: v9.0.0-rc1~154^2~6
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f718b1596a1658ba28f1620a4cb2f39fd948bc1;p=dealii.git

Fix tests.

Co-authored-by: David Wells <drwells@vt.edu>
Co-authored-by: Jean-Paul Pelteret <jppelteret@gmail.com>
Co-authored-by: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
---

diff --git a/tests/aniso/mesh_3d_21.cc b/tests/aniso/mesh_3d_21.cc
index 7db7498f5f..982f197b09 100644
--- a/tests/aniso/mesh_3d_21.cc
+++ b/tests/aniso/mesh_3d_21.cc
@@ -203,6 +203,7 @@ int main ()
   {
     Triangulation<3> coarse_grid;
     GridGenerator::hyper_ball (coarse_grid);
+    coarse_grid.reset_manifold(0);
     check (coarse_grid);
   }
 
diff --git a/tests/aniso/refine_and_coarsen_anisotropic.cc b/tests/aniso/refine_and_coarsen_anisotropic.cc
index 350d20ce89..d2b3057d17 100644
--- a/tests/aniso/refine_and_coarsen_anisotropic.cc
+++ b/tests/aniso/refine_and_coarsen_anisotropic.cc
@@ -67,6 +67,7 @@ void test_isotropic (int type, std::ostream *logfile)
   else
     GridGenerator::hyper_ball (tria);
 
+  tria.reset_manifold(0);
   tria.refine_global(1);
 
   *logfile << "cycle: 0, number of cells: "<<tria.n_cells()
diff --git a/tests/bits/face_orientation_and_fe_nedelec_01.cc b/tests/bits/face_orientation_and_fe_nedelec_01.cc
index 08c0618a51..2e36d19240 100644
--- a/tests/bits/face_orientation_and_fe_nedelec_01.cc
+++ b/tests/bits/face_orientation_and_fe_nedelec_01.cc
@@ -178,6 +178,7 @@ void test_with_wrong_face_orientation (const FiniteElement<dim> &fe,
     {
       Triangulation<dim>     triangulation;
       GridGenerator::hyper_ball (triangulation);
+      triangulation.reset_manifold(0);
       typename Triangulation<dim>::active_cell_iterator
       cell = triangulation.begin_active();
       std::advance (cell, i);
diff --git a/tests/bits/face_orientation_and_fe_q_01.cc b/tests/bits/face_orientation_and_fe_q_01.cc
index 993b9dca50..3fe5a2d37f 100644
--- a/tests/bits/face_orientation_and_fe_q_01.cc
+++ b/tests/bits/face_orientation_and_fe_q_01.cc
@@ -181,6 +181,7 @@ void test_with_wrong_face_orientation (const FiniteElement<dim> &fe,
     {
       Triangulation<dim>     triangulation;
       GridGenerator::hyper_ball (triangulation);
+      triangulation.reset_manifold(0);
       typename Triangulation<dim>::active_cell_iterator
       cell = triangulation.begin_active();
       std::advance (cell, i);
diff --git a/tests/bits/find_cell_3.cc b/tests/bits/find_cell_3.cc
index 90e750ed72..ea35d2cb41 100644
--- a/tests/bits/find_cell_3.cc
+++ b/tests/bits/find_cell_3.cc
@@ -67,6 +67,7 @@ int main ()
   {
     Triangulation<3> coarse_grid;
     GridGenerator::hyper_ball (coarse_grid);
+    coarse_grid.reset_all_manifolds();
     coarse_grid.refine_global (1);
     check (coarse_grid);
   }
diff --git a/tests/bits/find_cell_alt_3.cc b/tests/bits/find_cell_alt_3.cc
index 00538d6acb..a3dc77c542 100644
--- a/tests/bits/find_cell_alt_3.cc
+++ b/tests/bits/find_cell_alt_3.cc
@@ -72,6 +72,7 @@ int main ()
   {
     Triangulation<3> coarse_grid;
     GridGenerator::hyper_ball (coarse_grid);
+    coarse_grid.reset_all_manifolds();
     coarse_grid.refine_global (1);
     check (coarse_grid);
   }
diff --git a/tests/bits/step-2.cc b/tests/bits/step-2.cc
index 877aa351f9..b8bc7317a6 100644
--- a/tests/bits/step-2.cc
+++ b/tests/bits/step-2.cc
@@ -22,6 +22,7 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/manifold_lib.h>
 
 #include <deal.II/hp/dof_handler.h>
@@ -44,6 +45,8 @@ void make_grid (Triangulation<2> &triangulation)
   GridGenerator::hyper_shell (triangulation,
                               center, inner_radius, outer_radius,
                               10);
+  //triangulation.reset_all_manifolds();
+  GridTools::copy_boundary_to_manifold_id(triangulation);
 
   static const SphericalManifold<2> boundary_description(center);
   triangulation.set_manifold (0, boundary_description);
diff --git a/tests/bits/step-5.cc b/tests/bits/step-5.cc
index b88afc7181..a6b777f29c 100644
--- a/tests/bits/step-5.cc
+++ b/tests/bits/step-5.cc
@@ -32,6 +32,7 @@
 #include <deal.II/hp/dof_handler.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/dofs/dof_tools.h>
 #include <deal.II/fe/fe_q.h>
@@ -298,6 +299,7 @@ void LaplaceProblem<dim>::run ()
           Assert (dim==2, ExcInternalError());
 
           grid_in.read_ucd (input_file);
+          GridTools::copy_boundary_to_manifold_id(triangulation);
 
           static const SphericalManifold<dim> boundary;
           triangulation.set_manifold (0, boundary);
diff --git a/tests/codim_one/bem.cc b/tests/codim_one/bem.cc
index f3d95e137d..fb281683b5 100644
--- a/tests/codim_one/bem.cc
+++ b/tests/codim_one/bem.cc
@@ -35,6 +35,7 @@
 #include <deal.II/fe/mapping_q1.h>
 #include <deal.II/grid/grid_in.h>
 #include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/manifold_lib.h>
@@ -128,7 +129,6 @@ BEM<spacedim>::run()
       // works up to cycle<9, but for testin purpose, we stop at 4
       for (unsigned int cycle=0; cycle<4; ++cycle)
         {
-
           tria.set_manifold(1, boundary);
           tria.refine_global(1);
 
@@ -465,6 +465,9 @@ BEM<spacedim>::read_grid(std::string filename)
   gi.attach_triangulation (tria);
   std::ifstream in (filename.c_str());
   gi.read_ucd (in);
+
+  for (auto cell = tria.begin_active(); cell != tria.end(); ++cell)
+    cell->set_all_manifold_ids(1);
 }
 
 
diff --git a/tests/codim_one/boundary_indicator_01.cc b/tests/codim_one/boundary_indicator_01.cc
index 5b2602ca2f..0fac459f16 100644
--- a/tests/codim_one/boundary_indicator_01.cc
+++ b/tests/codim_one/boundary_indicator_01.cc
@@ -60,6 +60,7 @@ int main ()
     const SphericalManifold<dim> boundary_description;
     Triangulation<dim> volume_mesh;
     GridGenerator::hyper_ball(volume_mesh);
+    GridTools::copy_boundary_to_manifold_id(volume_mesh);
     volume_mesh.set_manifold (0, boundary_description);
 
     // exclude one of the 6 faces
@@ -107,6 +108,7 @@ int main ()
       for (unsigned int f=0; f<GeometryInfo<dim-1>::faces_per_cell; ++f)
         if (cell->at_boundary(f))
           cell->face(f)->set_boundary_id(1);
+    GridTools::copy_boundary_to_manifold_id(boundary_mesh);
 
     boundary_mesh.refine_global (2);
 
diff --git a/tests/codim_one/extract_boundary_mesh_01.cc b/tests/codim_one/extract_boundary_mesh_01.cc
index 18d89cbe64..3a903ed635 100644
--- a/tests/codim_one/extract_boundary_mesh_01.cc
+++ b/tests/codim_one/extract_boundary_mesh_01.cc
@@ -102,13 +102,14 @@ int main ()
     // Extract the boundary of a hyper-sphere
 
     const int dim = 3;
-    deallog << "Testing hyper_cube in dim: " << dim << "..."<< endl;
+    deallog << "Testing hyper_ball in dim: " << dim << "..."<< endl;
 
     map< Triangulation<dim-1,dim>::cell_iterator,
          Triangulation<dim,dim>::face_iterator>
          surface_to_volume_mapping;
     Triangulation<dim> volume_mesh;
     GridGenerator::hyper_ball(volume_mesh);
+    volume_mesh.reset_manifold (0);
 
     volume_mesh.refine_global (1);
 
diff --git a/tests/codim_one/extract_boundary_mesh_01.output b/tests/codim_one/extract_boundary_mesh_01.output
index 13519be2dc..5a040e28c0 100644
--- a/tests/codim_one/extract_boundary_mesh_01.output
+++ b/tests/codim_one/extract_boundary_mesh_01.output
@@ -1,5 +1,5 @@
 
-DEAL::Testing hyper_cube in dim: 3...
+DEAL::Testing hyper_ball in dim: 3...
 DEAL::The last column should be 0
 DEAL::Vol faces		Surf cell		Distance
 DEAL::
diff --git a/tests/codim_one/extract_boundary_mesh_03.cc b/tests/codim_one/extract_boundary_mesh_03.cc
index bb0a0e7f8e..4f2e876524 100644
--- a/tests/codim_one/extract_boundary_mesh_03.cc
+++ b/tests/codim_one/extract_boundary_mesh_03.cc
@@ -97,7 +97,7 @@ int main ()
     // Extract the boundary of a hyper-sphere
 
     const int dim = 3;
-    deallog << "Testing hyper_cube in dim: " << dim << "..."<< endl;
+    deallog << "Testing hyper_ball in dim: " << dim << "..."<< endl;
 
     map< Triangulation<dim-1,dim>::cell_iterator,
          Triangulation<dim,dim>::face_iterator>
@@ -111,6 +111,7 @@ int main ()
       for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
         if (cell->at_boundary(f))
           cell->face(f)->set_all_boundary_ids (1);
+    GridTools::copy_boundary_to_manifold_id(volume_mesh);
     volume_mesh.set_manifold (1, boundary_description);
     volume_mesh.refine_global (1);
 
diff --git a/tests/codim_one/extract_boundary_mesh_03.output b/tests/codim_one/extract_boundary_mesh_03.output
index 70d72f9f42..3f9e2c745f 100644
--- a/tests/codim_one/extract_boundary_mesh_03.output
+++ b/tests/codim_one/extract_boundary_mesh_03.output
@@ -1,5 +1,5 @@
 
-DEAL::Testing hyper_cube in dim: 3...
+DEAL::Testing hyper_ball in dim: 3...
 DEAL::56
 DEAL::24
 -0.577350 -0.577350 -0.577350 1 1
diff --git a/tests/codim_one/extract_boundary_mesh_10.cc b/tests/codim_one/extract_boundary_mesh_10.cc
index 45623c267e..acf880c243 100644
--- a/tests/codim_one/extract_boundary_mesh_10.cc
+++ b/tests/codim_one/extract_boundary_mesh_10.cc
@@ -38,13 +38,18 @@
 #include <deal.II/grid/tria_boundary_lib.h>
 
 
-
 void test()
 {
   const int dim=3;
 
   Triangulation<dim>   triangulation;
   GridGenerator::cylinder(triangulation, 100, 200);
+  GridTools::copy_boundary_to_manifold_id(triangulation);
+  for (auto cell = triangulation.begin_active(); cell != triangulation.end(); ++cell)
+    for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
+      if (cell->face(f)->boundary_id() != numbers::invalid_boundary_id)
+        for (unsigned int e=0; e<GeometryInfo<dim>::lines_per_face; ++e)
+          cell->face(f)->line(e)->set_manifold_id(cell->face(f)->boundary_id());
 
   static const CylinderBoundary<dim> outer_cylinder (100,0);
   triangulation.set_manifold(0,outer_cylinder);
@@ -62,6 +67,9 @@ void test()
   triangulation_surface.refine_global (1);
   GridOut().write_gnuplot(triangulation_surface, deallog.get_file_stream());
 
+  std::ofstream output ("grid.vtk");
+  GridOut().write_vtk(triangulation_surface, output);
+
   deallog << triangulation_surface.n_used_vertices() << std::endl;
   deallog << triangulation_surface.n_active_cells() << std::endl;
 }
diff --git a/tests/codim_one/grid_refinement.cc b/tests/codim_one/grid_refinement.cc
index 7da831efa2..eaaa2ac2ea 100644
--- a/tests/codim_one/grid_refinement.cc
+++ b/tests/codim_one/grid_refinement.cc
@@ -24,6 +24,7 @@
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/grid_in.h>
 #include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/manifold_lib.h>
 
 #include <string>
@@ -35,11 +36,12 @@ void test(std::string filename)
 {
   SphericalManifold<dim, spacedim> boundary;
   Triangulation<dim, spacedim> tria;
-  tria.set_manifold(1, boundary);
   GridIn<dim, spacedim> gi;
   gi.attach_triangulation (tria);
   std::ifstream in (filename.c_str());
   gi.read_ucd (in);
+  tria.set_all_manifold_ids(1);
+  tria.set_manifold(1, boundary);
 
   GridOut grid_out;
   grid_out.set_flags (GridOutFlags::Ucd(true));
diff --git a/tests/dofs/dof_renumbering.cc b/tests/dofs/dof_renumbering.cc
index 12417d7a09..91c40b4e67 100644
--- a/tests/dofs/dof_renumbering.cc
+++ b/tests/dofs/dof_renumbering.cc
@@ -153,6 +153,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_all_manifolds();
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/fe/cell_similarity_05.cc b/tests/fe/cell_similarity_05.cc
index 332515644e..18d03e129f 100644
--- a/tests/fe/cell_similarity_05.cc
+++ b/tests/fe/cell_similarity_05.cc
@@ -34,6 +34,7 @@
 #include <deal.II/lac/vector.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/manifold_lib.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_dgq.h>
@@ -155,7 +156,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_id (1);
+      tr.begin_active()->face(f)->set_manifold_id (1);
 
   test(tr);
 }
diff --git a/tests/fe/cell_similarity_06.cc b/tests/fe/cell_similarity_06.cc
index 6f99223434..751785ff29 100644
--- a/tests/fe/cell_similarity_06.cc
+++ b/tests/fe/cell_similarity_06.cc
@@ -155,7 +155,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_id (1);
+      tr.begin_active()->face(f)->set_manifold_id (1);
 
   test(tr);
 }
diff --git a/tests/fe/cell_similarity_07.cc b/tests/fe/cell_similarity_07.cc
index bcbc0670c8..5c05329aeb 100644
--- a/tests/fe/cell_similarity_07.cc
+++ b/tests/fe/cell_similarity_07.cc
@@ -155,7 +155,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_id (1);
+      tr.begin_active()->face(f)->set_manifold_id (1);
 
   test(tr);
 }
diff --git a/tests/fe/cell_similarity_08.cc b/tests/fe/cell_similarity_08.cc
index 1e9beadd34..abfc2438e1 100644
--- a/tests/fe/cell_similarity_08.cc
+++ b/tests/fe/cell_similarity_08.cc
@@ -34,6 +34,7 @@
 #include <deal.II/lac/vector.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/manifold_lib.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_dgq.h>
@@ -148,6 +149,7 @@ void test()
   std::vector<unsigned int> subdivisions (dim, 1);
   subdivisions[0] = 2;
   GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2);
+  GridTools::copy_boundary_to_manifold_id(tr);
 
   static const SphericalManifold<dim> boundary(tr.begin_active()->center());
   tr.set_manifold (1, boundary);
@@ -155,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_id (1);
+      tr.begin_active()->face(f)->set_manifold_id (1);
 
   test(tr);
 }
diff --git a/tests/fe/cell_similarity_11.cc b/tests/fe/cell_similarity_11.cc
index eb61db2120..f25ef7fcbe 100644
--- a/tests/fe/cell_similarity_11.cc
+++ b/tests/fe/cell_similarity_11.cc
@@ -110,7 +110,7 @@ void test()
       if (cell->face(f)->at_boundary() &&
           std::abs(cell->face(f)->center()[0]+1.) < 1e-12 &&
           std::abs(cell->face(f)->center()[1]) < 1e-12)
-        cell->face(f)->set_boundary_id(1);
+        cell->face(f)->set_manifold_id(1);
 
   static const SphericalManifold<dim> boundary;
   tr.set_manifold (1, boundary);
diff --git a/tests/fe/cell_similarity_dgp_monomial_05.cc b/tests/fe/cell_similarity_dgp_monomial_05.cc
index 516fcdc061..06a43a006b 100644
--- a/tests/fe/cell_similarity_dgp_monomial_05.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_05.cc
@@ -155,7 +155,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_id (1);
+      tr.begin_active()->face(f)->set_manifold_id (1);
 
   test(tr);
 }
diff --git a/tests/fe/cell_similarity_dgp_monomial_06.cc b/tests/fe/cell_similarity_dgp_monomial_06.cc
index 0fc66c172d..92ecf3119a 100644
--- a/tests/fe/cell_similarity_dgp_monomial_06.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_06.cc
@@ -155,7 +155,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_id (1);
+      tr.begin_active()->face(f)->set_manifold_id (1);
 
   test(tr);
 }
diff --git a/tests/fe/cell_similarity_dgp_monomial_07.cc b/tests/fe/cell_similarity_dgp_monomial_07.cc
index 659f128946..be640e7c51 100644
--- a/tests/fe/cell_similarity_dgp_monomial_07.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_07.cc
@@ -155,7 +155,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_id (1);
+      tr.begin_active()->face(f)->set_manifold_id (1);
 
   test(tr);
 }
diff --git a/tests/fe/cell_similarity_dgp_monomial_08.cc b/tests/fe/cell_similarity_dgp_monomial_08.cc
index f1ea5f93ca..4862fe312a 100644
--- a/tests/fe/cell_similarity_dgp_monomial_08.cc
+++ b/tests/fe/cell_similarity_dgp_monomial_08.cc
@@ -155,7 +155,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_id (1);
+      tr.begin_active()->face(f)->set_manifold_id (1);
 
   test(tr);
 }
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_05.cc b/tests/fe/cell_similarity_dgp_nonparametric_05.cc
index 71863c2a66..efc11763d1 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_05.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_05.cc
@@ -155,7 +155,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_id (1);
+      tr.begin_active()->face(f)->set_manifold_id (1);
 
   test(tr);
 }
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_06.cc b/tests/fe/cell_similarity_dgp_nonparametric_06.cc
index 4c327a865f..a11b5de3ed 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_06.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_06.cc
@@ -155,7 +155,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_id (1);
+      tr.begin_active()->face(f)->set_manifold_id (1);
 
   test(tr);
 }
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_07.cc b/tests/fe/cell_similarity_dgp_nonparametric_07.cc
index 9c5c19aab8..2c75b4f904 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_07.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_07.cc
@@ -155,7 +155,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_id (1);
+      tr.begin_active()->face(f)->set_manifold_id (1);
 
   test(tr);
 }
diff --git a/tests/fe/cell_similarity_dgp_nonparametric_08.cc b/tests/fe/cell_similarity_dgp_nonparametric_08.cc
index ee19c1c38b..d7c1d29344 100644
--- a/tests/fe/cell_similarity_dgp_nonparametric_08.cc
+++ b/tests/fe/cell_similarity_dgp_nonparametric_08.cc
@@ -155,7 +155,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_id (1);
+      tr.begin_active()->face(f)->set_manifold_id (1);
 
   test(tr);
 }
diff --git a/tests/fe/mass_matrix_arbitrary_nodes.cc b/tests/fe/mass_matrix_arbitrary_nodes.cc
index 44d6691052..39b95d9ca3 100644
--- a/tests/fe/mass_matrix_arbitrary_nodes.cc
+++ b/tests/fe/mass_matrix_arbitrary_nodes.cc
@@ -44,6 +44,7 @@ void check ()
         GridGenerator::hyper_cube (tr);
       else
         GridGenerator::hyper_ball (tr);
+      tr.reset_manifold(0);
       tr.refine_global (3-dim);
 
       FE_DGQArbitraryNodes<dim> fe ((QGauss<1>(q_points)));
diff --git a/tests/grid/grid_hyper_shell.cc b/tests/grid/grid_hyper_shell.cc
index a767e6e373..874b880627 100644
--- a/tests/grid/grid_hyper_shell.cc
+++ b/tests/grid/grid_hyper_shell.cc
@@ -45,12 +45,15 @@ void check (double r1, double r2, unsigned int n)
   // 3d. the test was written in a way that it tests with this bug present, so
   // undo the big fix here
   GridGenerator::hyper_shell (tria, center, r1, r2, n, true);
+  tria.reset_manifold(0);
+  tria.set_all_manifold_ids(numbers::flat_manifold_id);
+  GridTools::copy_boundary_to_manifold_id(tria);
   if (dim==3)
     for (typename Triangulation<dim>::active_cell_iterator c=tria.begin_active(); c!=tria.end(); ++c)
       for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
         if (c->face(f)->at_boundary())
           for (unsigned int e=0; e<GeometryInfo<dim>::lines_per_face; ++e)
-            c->face(f)->line(e)->set_boundary_id(0);
+            c->face(f)->line(e)->set_manifold_id(0);
 
   static const SphericalManifold<dim> boundary(center);
   tria.set_manifold(0, boundary);
diff --git a/tests/grid/grid_out_svg_01.cc b/tests/grid/grid_out_svg_01.cc
index 8aea71c5ee..be939cb54c 100644
--- a/tests/grid/grid_out_svg_01.cc
+++ b/tests/grid/grid_out_svg_01.cc
@@ -35,6 +35,7 @@ Triangulation<2,2> create_grid()
   Point<2> center(0., 0.);
 
   GridGenerator::hyper_cube_with_cylindrical_hole(triangulation, inner_radius, outer_radius);
+  triangulation.reset_manifold(0);
   triangulation.refine_global(1);
 
   Triangulation<2>::active_cell_iterator
diff --git a/tests/grid/grid_out_svg_02.cc b/tests/grid/grid_out_svg_02.cc
index e85b91ea22..ef82acab1e 100644
--- a/tests/grid/grid_out_svg_02.cc
+++ b/tests/grid/grid_out_svg_02.cc
@@ -35,6 +35,7 @@ Triangulation<2,2> create_grid()
   Point<2> center(0., 0.);
 
   GridGenerator::hyper_cube_with_cylindrical_hole(triangulation, inner_radius, outer_radius);
+  triangulation.reset_manifold(0);
   triangulation.refine_global(1);
 
   for (unsigned int l=0; l<3; ++l)
diff --git a/tests/grid/grid_output_input.cc b/tests/grid/grid_output_input.cc
index d1aad878aa..6622c08c19 100644
--- a/tests/grid/grid_output_input.cc
+++ b/tests/grid/grid_output_input.cc
@@ -24,6 +24,7 @@
 #include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/grid_out.h>
 #include <deal.II/grid/grid_in.h>
+#include <deal.II/grid/grid_tools.h>
 
 
 
@@ -36,6 +37,8 @@ void test(std::ostream &out)
   Triangulation<dim> tr;
 
   GridGenerator::hyper_cube_with_cylindrical_hole(tr, .3, .4, 1, 1, false);
+  tr.reset_manifold(0);
+  GridTools::copy_boundary_to_manifold_id(tr);
   CylindricalManifold<dim> boundary(2);
   tr.set_manifold(1, boundary);
   {
@@ -46,8 +49,6 @@ void test(std::ostream &out)
   tr.refine_global(1);
   deallog << "Writing refined from constructor" << std::endl;
   go.write_ucd(tr, out);
-
-  tr.reset_manifold(1);
   tr.clear();
 
   GridIn<dim> gi;
@@ -59,7 +60,8 @@ void test(std::ostream &out)
     grid_file.close();
   }
 
-  tr.set_manifold(1, boundary);
+  GridTools::map_boundary_to_manifold_ids({1}, {0},tr);
+  tr.set_manifold(0, boundary);
   tr.refine_global(1);
   deallog << "Writing refined from file" << std::endl;
   go.write_ucd(tr, out);
@@ -69,8 +71,6 @@ void test(std::ostream &out)
     go.write_msh(tr, grid_file);
     grid_file.close();
   }
-
-  tr.reset_manifold(1);
   tr.clear();
 }
 
diff --git a/tests/grid/grid_transform.cc b/tests/grid/grid_transform.cc
index aa55897955..ba3d89abf6 100644
--- a/tests/grid/grid_transform.cc
+++ b/tests/grid/grid_transform.cc
@@ -33,13 +33,14 @@ int main ()
 {
   const unsigned int dim=2;
   Point<dim> origin;
-  SphericalManifold<dim> boundary(origin);
   MappingQ<dim> mapping(2);
   Triangulation<dim> tria;
-  tria.set_manifold(0, boundary);
   const double inner_radius=1.;
   const double outer_radius=5.;
   GridGenerator::hyper_shell(tria, origin, inner_radius, outer_radius, 8);
+  GridTools::copy_boundary_to_manifold_id(tria);
+  SphericalManifold<dim> boundary(origin);
+  tria.set_manifold(0, boundary);
   tria.refine_global(2);
 
   // build up a map of vertex indices
@@ -94,7 +95,7 @@ int main ()
                 }
           }
     }
-
+  GridTools::copy_boundary_to_manifold_id(tria);
   GridTools::laplace_transform (new_points, tria);
   SphericalManifold<dim> inner_ball(n_center);
   tria.set_manifold(1, inner_ball);
diff --git a/tests/grid/grid_transform_coefficient.cc b/tests/grid/grid_transform_coefficient.cc
index a30c11acd4..00afc48fb8 100644
--- a/tests/grid/grid_transform_coefficient.cc
+++ b/tests/grid/grid_transform_coefficient.cc
@@ -47,10 +47,12 @@ int main ()
   SphericalManifold<dim> boundary(origin);
   MappingQ<dim> mapping(2);
   Triangulation<dim> tria;
-  tria.set_manifold(0, boundary);
   const double inner_radius=1.;
   const double outer_radius=5.;
   GridGenerator::hyper_shell(tria, origin, inner_radius, outer_radius, 8);
+  tria.set_all_manifold_ids(numbers::flat_manifold_id);
+  GridTools::copy_boundary_to_manifold_id(tria);
+  tria.set_manifold(0, boundary);
   tria.refine_global(2);
 
   // build up a map of vertex indices
@@ -98,7 +100,7 @@ int main ()
                       // circle.
                       new_points.insert(std::pair<types::global_dof_index, Point<dim> > (
                                           face->vertex_index(vertex_no), n_radius/inner_radius*v+n_center));
-                      face->set_boundary_id(1);
+                      face->set_manifold_id(1);
                     }
                   else
                     Assert(false, ExcInternalError());
diff --git a/tests/grid/manifold_ids_on_boundary_01.cc b/tests/grid/manifold_ids_on_boundary_01.cc
index fcb22668c2..7e57130473 100644
--- a/tests/grid/manifold_ids_on_boundary_01.cc
+++ b/tests/grid/manifold_ids_on_boundary_01.cc
@@ -21,6 +21,7 @@
 #include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/grid_tools.h>
 
 #include <iostream>
 
@@ -34,8 +35,10 @@ void dim_2(std::ostream &os)
   Triangulation<d> tr;
 
   GridGenerator::hyper_cube_with_cylindrical_hole(tr,inner,outer,outer,true);
+  tr.set_all_manifold_ids_on_boundary(numbers::flat_manifold_id);
+  tr.reset_manifold(0);
   static SphericalManifold<d> boundary;
-  tr.set_all_manifold_ids_on_boundary(1,1);
+  GridTools::copy_boundary_to_manifold_id(tr);
   tr.set_manifold(1,boundary);
 
   tr.refine_global(2);
@@ -55,8 +58,10 @@ void dim_3(std::ostream &os)
   Triangulation<d> tr;
 
   GridGenerator::hyper_cube_with_cylindrical_hole(tr,inner,outer,outer,true);
+  tr.set_all_manifold_ids_on_boundary(numbers::flat_manifold_id);
+  tr.reset_manifold(0);
   static CylindricalManifold<d> boundary(2);
-  tr.set_all_manifold_ids_on_boundary(1,1);
+  GridTools::copy_boundary_to_manifold_id(tr);
   tr.set_manifold(1,boundary);
 
   tr.refine_global(1);
diff --git a/tests/grid/manifold_ids_on_boundary_01.output b/tests/grid/manifold_ids_on_boundary_01.output
index 193c94030e..544274ac9a 100644
--- a/tests/grid/manifold_ids_on_boundary_01.output
+++ b/tests/grid/manifold_ids_on_boundary_01.output
@@ -678,7 +678,7 @@ POINTS 512 double
 1.00000 0.500000 0.500000
 0.600000 0.00000 1.00000
 0.592388 0.288268 1.00000
-0.600000 0.00000 0.500000
+0.600000 -6.93889e-18 0.500000
 0.592388 0.288268 0.500000
 1.00000 0.500000 1.00000
 1.00000 1.00000 1.00000
@@ -692,7 +692,7 @@ POINTS 512 double
 1.00000 0.500000 0.500000
 1.00000 0.00000 0.00000
 1.00000 0.500000 0.00000
-0.600000 0.00000 0.500000
+0.600000 -6.93889e-18 0.500000
 0.592388 0.288268 0.500000
 0.600000 0.00000 0.00000
 0.592388 0.288268 0.00000
@@ -706,11 +706,11 @@ POINTS 512 double
 0.570711 0.570711 0.00000
 0.600000 0.00000 1.00000
 0.592388 0.288268 1.00000
-0.600000 0.00000 0.500000
+0.600000 -6.93889e-18 0.500000
 0.592388 0.288268 0.500000
 0.200000 0.00000 1.00000
 0.184776 0.0765367 1.00000
-0.200000 0.00000 0.500000
+0.200000 -1.38778e-17 0.500000
 0.184776 0.0765367 0.500000
 0.592388 0.288268 1.00000
 0.570711 0.570711 1.00000
@@ -720,11 +720,11 @@ POINTS 512 double
 0.141421 0.141421 1.00000
 0.184776 0.0765367 0.500000
 0.141421 0.141421 0.500000
-0.600000 0.00000 0.500000
+0.600000 -6.93889e-18 0.500000
 0.592388 0.288268 0.500000
 0.600000 0.00000 0.00000
 0.592388 0.288268 0.00000
-0.200000 0.00000 0.500000
+0.200000 -1.38778e-17 0.500000
 0.184776 0.0765367 0.500000
 0.200000 0.00000 0.00000
 0.184776 0.0765367 0.00000
@@ -751,7 +751,7 @@ POINTS 512 double
 0.288268 0.592388 1.00000
 3.67394e-17 0.600000 1.00000
 0.288268 0.592388 0.500000
-3.67394e-17 0.600000 0.500000
+3.75551e-17 0.600000 0.500000
 1.00000 1.00000 0.500000
 0.500000 1.00000 0.500000
 1.00000 1.00000 0.00000
@@ -765,7 +765,7 @@ POINTS 512 double
 0.500000 1.00000 0.00000
 6.12323e-17 1.00000 0.00000
 0.288268 0.592388 0.500000
-3.67394e-17 0.600000 0.500000
+3.75551e-17 0.600000 0.500000
 0.288268 0.592388 0.00000
 3.67394e-17 0.600000 0.00000
 0.570711 0.570711 1.00000
@@ -779,11 +779,11 @@ POINTS 512 double
 0.288268 0.592388 1.00000
 3.67394e-17 0.600000 1.00000
 0.288268 0.592388 0.500000
-3.67394e-17 0.600000 0.500000
+3.75551e-17 0.600000 0.500000
 0.0765367 0.184776 1.00000
 1.22465e-17 0.200000 1.00000
 0.0765367 0.184776 0.500000
-1.22465e-17 0.200000 0.500000
+1.38778e-17 0.200000 0.500000
 0.570711 0.570711 0.500000
 0.288268 0.592388 0.500000
 0.570711 0.570711 0.00000
@@ -793,11 +793,11 @@ POINTS 512 double
 0.141421 0.141421 0.00000
 0.0765367 0.184776 0.00000
 0.288268 0.592388 0.500000
-3.67394e-17 0.600000 0.500000
+3.75551e-17 0.600000 0.500000
 0.288268 0.592388 0.00000
 3.67394e-17 0.600000 0.00000
 0.0765367 0.184776 0.500000
-1.22465e-17 0.200000 0.500000
+1.38778e-17 0.200000 0.500000
 0.0765367 0.184776 0.00000
 1.22465e-17 0.200000 0.00000
 6.12323e-17 1.00000 1.00000
@@ -806,7 +806,7 @@ POINTS 512 double
 -0.500000 1.00000 0.500000
 3.67394e-17 0.600000 1.00000
 -0.288268 0.592388 1.00000
-3.67394e-17 0.600000 0.500000
+3.75551e-17 0.600000 0.500000
 -0.288268 0.592388 0.500000
 -0.500000 1.00000 1.00000
 -1.00000 1.00000 1.00000
@@ -820,7 +820,7 @@ POINTS 512 double
 -0.500000 1.00000 0.500000
 6.12323e-17 1.00000 0.00000
 -0.500000 1.00000 0.00000
-3.67394e-17 0.600000 0.500000
+3.75551e-17 0.600000 0.500000
 -0.288268 0.592388 0.500000
 3.67394e-17 0.600000 0.00000
 -0.288268 0.592388 0.00000
@@ -834,11 +834,11 @@ POINTS 512 double
 -0.570711 0.570711 0.00000
 3.67394e-17 0.600000 1.00000
 -0.288268 0.592388 1.00000
-3.67394e-17 0.600000 0.500000
+3.75551e-17 0.600000 0.500000
 -0.288268 0.592388 0.500000
 1.22465e-17 0.200000 1.00000
 -0.0765367 0.184776 1.00000
-1.22465e-17 0.200000 0.500000
+1.38778e-17 0.200000 0.500000
 -0.0765367 0.184776 0.500000
 -0.288268 0.592388 1.00000
 -0.570711 0.570711 1.00000
@@ -848,11 +848,11 @@ POINTS 512 double
 -0.141421 0.141421 1.00000
 -0.0765367 0.184776 0.500000
 -0.141421 0.141421 0.500000
-3.67394e-17 0.600000 0.500000
+3.75551e-17 0.600000 0.500000
 -0.288268 0.592388 0.500000
 3.67394e-17 0.600000 0.00000
 -0.288268 0.592388 0.00000
-1.22465e-17 0.200000 0.500000
+1.38778e-17 0.200000 0.500000
 -0.0765367 0.184776 0.500000
 1.22465e-17 0.200000 0.00000
 -0.0765367 0.184776 0.00000
@@ -879,7 +879,7 @@ POINTS 512 double
 -0.592388 0.288268 1.00000
 -0.600000 7.34788e-17 1.00000
 -0.592388 0.288268 0.500000
--0.600000 7.34788e-17 0.500000
+-0.600000 8.20490e-17 0.500000
 -1.00000 1.00000 0.500000
 -1.00000 0.500000 0.500000
 -1.00000 1.00000 0.00000
@@ -893,7 +893,7 @@ POINTS 512 double
 -1.00000 0.500000 0.00000
 -1.00000 1.22465e-16 0.00000
 -0.592388 0.288268 0.500000
--0.600000 7.34788e-17 0.500000
+-0.600000 8.20490e-17 0.500000
 -0.592388 0.288268 0.00000
 -0.600000 7.34788e-17 0.00000
 -0.570711 0.570711 1.00000
@@ -907,11 +907,11 @@ POINTS 512 double
 -0.592388 0.288268 1.00000
 -0.600000 7.34788e-17 1.00000
 -0.592388 0.288268 0.500000
--0.600000 7.34788e-17 0.500000
+-0.600000 8.20490e-17 0.500000
 -0.184776 0.0765367 1.00000
 -0.200000 2.44929e-17 1.00000
 -0.184776 0.0765367 0.500000
--0.200000 2.44929e-17 0.500000
+-0.200000 4.16334e-17 0.500000
 -0.570711 0.570711 0.500000
 -0.592388 0.288268 0.500000
 -0.570711 0.570711 0.00000
@@ -921,11 +921,11 @@ POINTS 512 double
 -0.141421 0.141421 0.00000
 -0.184776 0.0765367 0.00000
 -0.592388 0.288268 0.500000
--0.600000 7.34788e-17 0.500000
+-0.600000 8.20490e-17 0.500000
 -0.592388 0.288268 0.00000
 -0.600000 7.34788e-17 0.00000
 -0.184776 0.0765367 0.500000
--0.200000 2.44929e-17 0.500000
+-0.200000 4.16334e-17 0.500000
 -0.184776 0.0765367 0.00000
 -0.200000 2.44929e-17 0.00000
 -1.00000 1.22465e-16 1.00000
@@ -934,7 +934,7 @@ POINTS 512 double
 -1.00000 -0.500000 0.500000
 -0.600000 7.34788e-17 1.00000
 -0.592388 -0.288268 1.00000
--0.600000 7.34788e-17 0.500000
+-0.600000 8.20490e-17 0.500000
 -0.592388 -0.288268 0.500000
 -1.00000 -0.500000 1.00000
 -1.00000 -1.00000 1.00000
@@ -948,7 +948,7 @@ POINTS 512 double
 -1.00000 -0.500000 0.500000
 -1.00000 1.22465e-16 0.00000
 -1.00000 -0.500000 0.00000
--0.600000 7.34788e-17 0.500000
+-0.600000 8.20490e-17 0.500000
 -0.592388 -0.288268 0.500000
 -0.600000 7.34788e-17 0.00000
 -0.592388 -0.288268 0.00000
@@ -962,11 +962,11 @@ POINTS 512 double
 -0.570711 -0.570711 0.00000
 -0.600000 7.34788e-17 1.00000
 -0.592388 -0.288268 1.00000
--0.600000 7.34788e-17 0.500000
+-0.600000 8.20490e-17 0.500000
 -0.592388 -0.288268 0.500000
 -0.200000 2.44929e-17 1.00000
 -0.184776 -0.0765367 1.00000
--0.200000 2.44929e-17 0.500000
+-0.200000 4.16334e-17 0.500000
 -0.184776 -0.0765367 0.500000
 -0.592388 -0.288268 1.00000
 -0.570711 -0.570711 1.00000
@@ -976,11 +976,11 @@ POINTS 512 double
 -0.141421 -0.141421 1.00000
 -0.184776 -0.0765367 0.500000
 -0.141421 -0.141421 0.500000
--0.600000 7.34788e-17 0.500000
+-0.600000 8.20490e-17 0.500000
 -0.592388 -0.288268 0.500000
 -0.600000 7.34788e-17 0.00000
 -0.592388 -0.288268 0.00000
--0.200000 2.44929e-17 0.500000
+-0.200000 4.16334e-17 0.500000
 -0.184776 -0.0765367 0.500000
 -0.200000 2.44929e-17 0.00000
 -0.184776 -0.0765367 0.00000
@@ -1007,7 +1007,7 @@ POINTS 512 double
 -0.288268 -0.592388 1.00000
 -1.10218e-16 -0.600000 1.00000
 -0.288268 -0.592388 0.500000
--1.10218e-16 -0.600000 0.500000
+-9.87874e-17 -0.600000 0.500000
 -1.00000 -1.00000 0.500000
 -0.500000 -1.00000 0.500000
 -1.00000 -1.00000 0.00000
@@ -1021,7 +1021,7 @@ POINTS 512 double
 -0.500000 -1.00000 0.00000
 -1.83697e-16 -1.00000 0.00000
 -0.288268 -0.592388 0.500000
--1.10218e-16 -0.600000 0.500000
+-9.87874e-17 -0.600000 0.500000
 -0.288268 -0.592388 0.00000
 -1.10218e-16 -0.600000 0.00000
 -0.570711 -0.570711 1.00000
@@ -1035,11 +1035,11 @@ POINTS 512 double
 -0.288268 -0.592388 1.00000
 -1.10218e-16 -0.600000 1.00000
 -0.288268 -0.592388 0.500000
--1.10218e-16 -0.600000 0.500000
+-9.87874e-17 -0.600000 0.500000
 -0.0765367 -0.184776 1.00000
 -3.67394e-17 -0.200000 1.00000
 -0.0765367 -0.184776 0.500000
--3.67394e-17 -0.200000 0.500000
+-1.38778e-17 -0.200000 0.500000
 -0.570711 -0.570711 0.500000
 -0.288268 -0.592388 0.500000
 -0.570711 -0.570711 0.00000
@@ -1049,11 +1049,11 @@ POINTS 512 double
 -0.141421 -0.141421 0.00000
 -0.0765367 -0.184776 0.00000
 -0.288268 -0.592388 0.500000
--1.10218e-16 -0.600000 0.500000
+-9.87874e-17 -0.600000 0.500000
 -0.288268 -0.592388 0.00000
 -1.10218e-16 -0.600000 0.00000
 -0.0765367 -0.184776 0.500000
--3.67394e-17 -0.200000 0.500000
+-1.38778e-17 -0.200000 0.500000
 -0.0765367 -0.184776 0.00000
 -3.67394e-17 -0.200000 0.00000
 -1.83697e-16 -1.00000 1.00000
@@ -1062,7 +1062,7 @@ POINTS 512 double
 0.500000 -1.00000 0.500000
 -1.10218e-16 -0.600000 1.00000
 0.288268 -0.592388 1.00000
--1.10218e-16 -0.600000 0.500000
+-9.87874e-17 -0.600000 0.500000
 0.288268 -0.592388 0.500000
 0.500000 -1.00000 1.00000
 1.00000 -1.00000 1.00000
@@ -1076,7 +1076,7 @@ POINTS 512 double
 0.500000 -1.00000 0.500000
 -1.83697e-16 -1.00000 0.00000
 0.500000 -1.00000 0.00000
--1.10218e-16 -0.600000 0.500000
+-9.87874e-17 -0.600000 0.500000
 0.288268 -0.592388 0.500000
 -1.10218e-16 -0.600000 0.00000
 0.288268 -0.592388 0.00000
@@ -1090,11 +1090,11 @@ POINTS 512 double
 0.570711 -0.570711 0.00000
 -1.10218e-16 -0.600000 1.00000
 0.288268 -0.592388 1.00000
--1.10218e-16 -0.600000 0.500000
+-9.87874e-17 -0.600000 0.500000
 0.288268 -0.592388 0.500000
 -3.67394e-17 -0.200000 1.00000
 0.0765367 -0.184776 1.00000
--3.67394e-17 -0.200000 0.500000
+-1.38778e-17 -0.200000 0.500000
 0.0765367 -0.184776 0.500000
 0.288268 -0.592388 1.00000
 0.570711 -0.570711 1.00000
@@ -1104,11 +1104,11 @@ POINTS 512 double
 0.141421 -0.141421 1.00000
 0.0765367 -0.184776 0.500000
 0.141421 -0.141421 0.500000
--1.10218e-16 -0.600000 0.500000
+-9.87874e-17 -0.600000 0.500000
 0.288268 -0.592388 0.500000
 -1.10218e-16 -0.600000 0.00000
 0.288268 -0.592388 0.00000
--3.67394e-17 -0.200000 0.500000
+-1.38778e-17 -0.200000 0.500000
 0.0765367 -0.184776 0.500000
 -3.67394e-17 -0.200000 0.00000
 0.0765367 -0.184776 0.00000
@@ -1135,7 +1135,7 @@ POINTS 512 double
 0.592388 -0.288268 1.00000
 0.600000 0.00000 1.00000
 0.592388 -0.288268 0.500000
-0.600000 0.00000 0.500000
+0.600000 -6.93889e-18 0.500000
 1.00000 -1.00000 0.500000
 1.00000 -0.500000 0.500000
 1.00000 -1.00000 0.00000
@@ -1149,7 +1149,7 @@ POINTS 512 double
 1.00000 -0.500000 0.00000
 1.00000 0.00000 0.00000
 0.592388 -0.288268 0.500000
-0.600000 0.00000 0.500000
+0.600000 -6.93889e-18 0.500000
 0.592388 -0.288268 0.00000
 0.600000 0.00000 0.00000
 0.570711 -0.570711 1.00000
@@ -1163,11 +1163,11 @@ POINTS 512 double
 0.592388 -0.288268 1.00000
 0.600000 0.00000 1.00000
 0.592388 -0.288268 0.500000
-0.600000 0.00000 0.500000
+0.600000 -6.93889e-18 0.500000
 0.184776 -0.0765367 1.00000
 0.200000 0.00000 1.00000
 0.184776 -0.0765367 0.500000
-0.200000 0.00000 0.500000
+0.200000 -1.38778e-17 0.500000
 0.570711 -0.570711 0.500000
 0.592388 -0.288268 0.500000
 0.570711 -0.570711 0.00000
@@ -1177,11 +1177,11 @@ POINTS 512 double
 0.141421 -0.141421 0.00000
 0.184776 -0.0765367 0.00000
 0.592388 -0.288268 0.500000
-0.600000 0.00000 0.500000
+0.600000 -6.93889e-18 0.500000
 0.592388 -0.288268 0.00000
 0.600000 0.00000 0.00000
 0.184776 -0.0765367 0.500000
-0.200000 0.00000 0.500000
+0.200000 -1.38778e-17 0.500000
 0.184776 -0.0765367 0.00000
 0.200000 0.00000 0.00000
 
@@ -1259,7 +1259,7 @@ LOOKUP_TABLE default
 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 
 SCALARS manifold double 1
 LOOKUP_TABLE default
--1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 -1.00000 
+0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 
 SCALARS material double 1
 LOOKUP_TABLE default
 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 
diff --git a/tests/grid/maximal_cell_diameter.cc b/tests/grid/maximal_cell_diameter.cc
index 91246c5c26..76fc4760a4 100644
--- a/tests/grid/maximal_cell_diameter.cc
+++ b/tests/grid/maximal_cell_diameter.cc
@@ -55,6 +55,7 @@ void test1 ()
     {
       Triangulation<dim> tria;
       GridGenerator::hyper_ball(tria, Point<dim>(), 1);
+      tria.reset_manifold(0);
 
       for (unsigned int i=0; i<2; ++i)
         {
diff --git a/tests/grid/maximal_cell_diameter_mpi.cc b/tests/grid/maximal_cell_diameter_mpi.cc
index 36ea24eb55..4878a4e9e0 100644
--- a/tests/grid/maximal_cell_diameter_mpi.cc
+++ b/tests/grid/maximal_cell_diameter_mpi.cc
@@ -50,6 +50,7 @@ void test1 ()
     {
       parallel::distributed::Triangulation<dim> tria(MPI_COMM_WORLD);
       GridGenerator::hyper_ball(tria, Point<dim>(), 1);
+      tria.reset_manifold(0);
 
       for (unsigned int i=0; i<2; ++i)
         {
diff --git a/tests/grid/mesh_3d_12.cc b/tests/grid/mesh_3d_12.cc
index 780597f0c0..d2b24665bf 100644
--- a/tests/grid/mesh_3d_12.cc
+++ b/tests/grid/mesh_3d_12.cc
@@ -103,6 +103,7 @@ int main ()
   {
     Triangulation<3> coarse_grid;
     GridGenerator::hyper_ball (coarse_grid);
+    coarse_grid.reset_manifold(0);
     check (coarse_grid);
   }
 
diff --git a/tests/grid/mesh_3d_14.cc b/tests/grid/mesh_3d_14.cc
index 32168e58e2..207b39a7a3 100644
--- a/tests/grid/mesh_3d_14.cc
+++ b/tests/grid/mesh_3d_14.cc
@@ -137,6 +137,7 @@ int main ()
   {
     Triangulation<3> coarse_grid;
     GridGenerator::hyper_ball (coarse_grid);
+    coarse_grid.reset_manifold(0);
     check (coarse_grid);
   }
 
diff --git a/tests/grid/mesh_3d_26.cc b/tests/grid/mesh_3d_26.cc
index 325c2377f3..0f8e61b64b 100644
--- a/tests/grid/mesh_3d_26.cc
+++ b/tests/grid/mesh_3d_26.cc
@@ -114,6 +114,7 @@ int main ()
 
   Triangulation<3> triangulation;
   GridGenerator::hyper_ball(triangulation);
+  triangulation.reset_manifold(0);
   triangulation.refine_global(1);
   test<3>(triangulation);
 }
diff --git a/tests/grid/mesh_3d_6.cc b/tests/grid/mesh_3d_6.cc
index 01c8ecca11..a279f1f72a 100644
--- a/tests/grid/mesh_3d_6.cc
+++ b/tests/grid/mesh_3d_6.cc
@@ -126,6 +126,7 @@ int main ()
   {
     Triangulation<3> coarse_grid;
     GridGenerator::hyper_ball (coarse_grid);
+    coarse_grid.reset_manifold(0);
     check (coarse_grid);
   }
 
diff --git a/tests/grid/mesh_3d_7.cc b/tests/grid/mesh_3d_7.cc
index 3dfa2e5b9d..56bb6941cb 100644
--- a/tests/grid/mesh_3d_7.cc
+++ b/tests/grid/mesh_3d_7.cc
@@ -135,6 +135,7 @@ int main ()
   {
     Triangulation<3> coarse_grid;
     GridGenerator::hyper_ball (coarse_grid);
+    coarse_grid.reset_manifold(0);
     check (coarse_grid);
   }
 
diff --git a/tests/grid/minimal_cell_diameter.cc b/tests/grid/minimal_cell_diameter.cc
index 4a120b8a03..381ad4418b 100644
--- a/tests/grid/minimal_cell_diameter.cc
+++ b/tests/grid/minimal_cell_diameter.cc
@@ -51,6 +51,7 @@ void test1 ()
     {
       Triangulation<dim> tria;
       GridGenerator::hyper_ball(tria, Point<dim>(), 1);
+      tria.reset_manifold(0);
 
       for (unsigned int i=0; i<2; ++i)
         {
diff --git a/tests/grid/minimal_cell_diameter_mpi.cc b/tests/grid/minimal_cell_diameter_mpi.cc
index 1d3afdeafc..041b14c539 100644
--- a/tests/grid/minimal_cell_diameter_mpi.cc
+++ b/tests/grid/minimal_cell_diameter_mpi.cc
@@ -46,6 +46,7 @@ void test1 ()
     {
       parallel::distributed::Triangulation<dim> tria(MPI_COMM_WORLD);
       GridGenerator::hyper_ball(tria, Point<dim>(), 1);
+      tria.reset_manifold(0);
 
       for (unsigned int i=0; i<2; ++i)
         {
diff --git a/tests/grid/recursively_set_material_id.cc b/tests/grid/recursively_set_material_id.cc
index ac95f1d390..0966a0f69e 100644
--- a/tests/grid/recursively_set_material_id.cc
+++ b/tests/grid/recursively_set_material_id.cc
@@ -35,7 +35,10 @@ void test()
 
       Triangulation<dim> tr;
       if (dim > 1)
-        GridGenerator::hyper_ball(tr);
+        {
+          GridGenerator::hyper_ball(tr);
+          tr.reset_manifold(0);
+        }
       else
         GridGenerator::hyper_cube(tr);
 
diff --git a/tests/hp/boundary_matrices.cc b/tests/hp/boundary_matrices.cc
index 779eba87b5..7432105604 100644
--- a/tests/hp/boundary_matrices.cc
+++ b/tests/hp/boundary_matrices.cc
@@ -74,6 +74,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/boundary_matrices_hp.cc b/tests/hp/boundary_matrices_hp.cc
index 7723cb304b..2ecccddc08 100644
--- a/tests/hp/boundary_matrices_hp.cc
+++ b/tests/hp/boundary_matrices_hp.cc
@@ -76,6 +76,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_laplace_matrix_01.cc b/tests/hp/create_laplace_matrix_01.cc
index 058691c08b..c89640139f 100644
--- a/tests/hp/create_laplace_matrix_01.cc
+++ b/tests/hp/create_laplace_matrix_01.cc
@@ -61,6 +61,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_laplace_matrix_01b.cc b/tests/hp/create_laplace_matrix_01b.cc
index fc7a457392..8a2b04af04 100644
--- a/tests/hp/create_laplace_matrix_01b.cc
+++ b/tests/hp/create_laplace_matrix_01b.cc
@@ -62,6 +62,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_laplace_matrix_02.cc b/tests/hp/create_laplace_matrix_02.cc
index 852e451a41..26f70f5b03 100644
--- a/tests/hp/create_laplace_matrix_02.cc
+++ b/tests/hp/create_laplace_matrix_02.cc
@@ -60,6 +60,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_laplace_matrix_02b.cc b/tests/hp/create_laplace_matrix_02b.cc
index 0286f64dbb..4791a29ea2 100644
--- a/tests/hp/create_laplace_matrix_02b.cc
+++ b/tests/hp/create_laplace_matrix_02b.cc
@@ -61,6 +61,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_laplace_matrix_03.cc b/tests/hp/create_laplace_matrix_03.cc
index 51ec100ac7..c1e5608dcd 100644
--- a/tests/hp/create_laplace_matrix_03.cc
+++ b/tests/hp/create_laplace_matrix_03.cc
@@ -60,6 +60,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_laplace_matrix_03b.cc b/tests/hp/create_laplace_matrix_03b.cc
index 9340e051bc..814e614e45 100644
--- a/tests/hp/create_laplace_matrix_03b.cc
+++ b/tests/hp/create_laplace_matrix_03b.cc
@@ -61,6 +61,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_laplace_matrix_04.cc b/tests/hp/create_laplace_matrix_04.cc
index 938fa314be..da477709fc 100644
--- a/tests/hp/create_laplace_matrix_04.cc
+++ b/tests/hp/create_laplace_matrix_04.cc
@@ -59,6 +59,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_laplace_matrix_04b.cc b/tests/hp/create_laplace_matrix_04b.cc
index a2fe2af6f7..9288b58ef1 100644
--- a/tests/hp/create_laplace_matrix_04b.cc
+++ b/tests/hp/create_laplace_matrix_04b.cc
@@ -60,6 +60,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_mass_matrix_01.cc b/tests/hp/create_mass_matrix_01.cc
index 0b8a840679..3bb93575c0 100644
--- a/tests/hp/create_mass_matrix_01.cc
+++ b/tests/hp/create_mass_matrix_01.cc
@@ -61,6 +61,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_mass_matrix_01b.cc b/tests/hp/create_mass_matrix_01b.cc
index c85e6bb8ed..9e5e309245 100644
--- a/tests/hp/create_mass_matrix_01b.cc
+++ b/tests/hp/create_mass_matrix_01b.cc
@@ -62,6 +62,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_mass_matrix_02.cc b/tests/hp/create_mass_matrix_02.cc
index 1a61e74142..537c90fbbb 100644
--- a/tests/hp/create_mass_matrix_02.cc
+++ b/tests/hp/create_mass_matrix_02.cc
@@ -60,6 +60,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_mass_matrix_02b.cc b/tests/hp/create_mass_matrix_02b.cc
index 3fe28037c1..77f96e9c80 100644
--- a/tests/hp/create_mass_matrix_02b.cc
+++ b/tests/hp/create_mass_matrix_02b.cc
@@ -61,6 +61,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_mass_matrix_03.cc b/tests/hp/create_mass_matrix_03.cc
index 32970c1590..8bc602ba7e 100644
--- a/tests/hp/create_mass_matrix_03.cc
+++ b/tests/hp/create_mass_matrix_03.cc
@@ -60,6 +60,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_mass_matrix_03b.cc b/tests/hp/create_mass_matrix_03b.cc
index 33d008dbeb..44f16ec2c7 100644
--- a/tests/hp/create_mass_matrix_03b.cc
+++ b/tests/hp/create_mass_matrix_03b.cc
@@ -61,6 +61,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_mass_matrix_04.cc b/tests/hp/create_mass_matrix_04.cc
index 9b390e1058..1b7c55482f 100644
--- a/tests/hp/create_mass_matrix_04.cc
+++ b/tests/hp/create_mass_matrix_04.cc
@@ -59,6 +59,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_mass_matrix_04b.cc b/tests/hp/create_mass_matrix_04b.cc
index 5e7e050252..4e4c5a27d3 100644
--- a/tests/hp/create_mass_matrix_04b.cc
+++ b/tests/hp/create_mass_matrix_04b.cc
@@ -60,6 +60,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/create_mass_matrix_05.cc b/tests/hp/create_mass_matrix_05.cc
index 01c92d38e2..3cf600b1b6 100644
--- a/tests/hp/create_mass_matrix_05.cc
+++ b/tests/hp/create_mass_matrix_05.cc
@@ -52,6 +52,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/matrices.cc b/tests/hp/matrices.cc
index c038ee43b4..4a04029f6a 100644
--- a/tests/hp/matrices.cc
+++ b/tests/hp/matrices.cc
@@ -132,6 +132,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/matrices_hp.cc b/tests/hp/matrices_hp.cc
index 96feec31ff..1ac803fa99 100644
--- a/tests/hp/matrices_hp.cc
+++ b/tests/hp/matrices_hp.cc
@@ -131,6 +131,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/step-2.cc b/tests/hp/step-2.cc
index 6e2adbe4e7..4647b36b86 100644
--- a/tests/hp/step-2.cc
+++ b/tests/hp/step-2.cc
@@ -22,6 +22,7 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/manifold_lib.h>
 
 #include <deal.II/hp/dof_handler.h>
@@ -44,6 +45,7 @@ void make_grid (Triangulation<2> &triangulation)
   GridGenerator::hyper_shell (triangulation,
                               center, inner_radius, outer_radius,
                               10);
+  GridTools::copy_boundary_to_manifold_id(triangulation);
 
   static const SphericalManifold<2> boundary_description(center);
   triangulation.set_manifold (0, boundary_description);
diff --git a/tests/hp/step-5.cc b/tests/hp/step-5.cc
index 8f3eaf7550..aa050a5eb8 100644
--- a/tests/hp/step-5.cc
+++ b/tests/hp/step-5.cc
@@ -31,6 +31,7 @@
 #include <deal.II/hp/dof_handler.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/dofs/dof_tools.h>
 #include <deal.II/fe/fe_q.h>
@@ -295,7 +296,8 @@ void LaplaceProblem<dim>::run ()
           std::ifstream input_file(SOURCE_DIR "/grids/circle-grid.inp");
           Assert (dim==2, ExcInternalError());
 
-          grid_in.read_ucd (input_file);
+          grid_in.read_ucd (input_file, true);
+          GridTools::copy_boundary_to_manifold_id(triangulation);
 
           static const SphericalManifold<dim> boundary;
           triangulation.set_manifold (0, boundary);
diff --git a/tests/hp/vectors_boundary_rhs_01.cc b/tests/hp/vectors_boundary_rhs_01.cc
index de56955fea..adc44b4a09 100644
--- a/tests/hp/vectors_boundary_rhs_01.cc
+++ b/tests/hp/vectors_boundary_rhs_01.cc
@@ -74,6 +74,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/vectors_boundary_rhs_02.cc b/tests/hp/vectors_boundary_rhs_02.cc
index 53d8d0f12c..c6b7989459 100644
--- a/tests/hp/vectors_boundary_rhs_02.cc
+++ b/tests/hp/vectors_boundary_rhs_02.cc
@@ -74,6 +74,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/vectors_boundary_rhs_03.cc b/tests/hp/vectors_boundary_rhs_03.cc
index d7b7e6eb89..82003503cc 100644
--- a/tests/hp/vectors_boundary_rhs_03.cc
+++ b/tests/hp/vectors_boundary_rhs_03.cc
@@ -73,6 +73,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/vectors_boundary_rhs_hp_01.cc b/tests/hp/vectors_boundary_rhs_hp_01.cc
index 1f8f86de57..8e6ea10050 100644
--- a/tests/hp/vectors_boundary_rhs_hp_01.cc
+++ b/tests/hp/vectors_boundary_rhs_hp_01.cc
@@ -74,6 +74,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/vectors_boundary_rhs_hp_03.cc b/tests/hp/vectors_boundary_rhs_hp_03.cc
index b0cdda8f85..9c3d5de456 100644
--- a/tests/hp/vectors_boundary_rhs_hp_03.cc
+++ b/tests/hp/vectors_boundary_rhs_hp_03.cc
@@ -73,6 +73,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/vectors_point_source_01.cc b/tests/hp/vectors_point_source_01.cc
index fd5e5d10cb..ada1b8a718 100644
--- a/tests/hp/vectors_point_source_01.cc
+++ b/tests/hp/vectors_point_source_01.cc
@@ -52,6 +52,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/vectors_point_source_hp_01.cc b/tests/hp/vectors_point_source_hp_01.cc
index b5d6576b57..f26eca9b51 100644
--- a/tests/hp/vectors_point_source_hp_01.cc
+++ b/tests/hp/vectors_point_source_hp_01.cc
@@ -51,6 +51,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/vectors_rhs_01.cc b/tests/hp/vectors_rhs_01.cc
index a9fcd74ec3..8a274ba9e4 100644
--- a/tests/hp/vectors_rhs_01.cc
+++ b/tests/hp/vectors_rhs_01.cc
@@ -74,6 +74,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/vectors_rhs_02.cc b/tests/hp/vectors_rhs_02.cc
index 1713d4a95b..9e78259f92 100644
--- a/tests/hp/vectors_rhs_02.cc
+++ b/tests/hp/vectors_rhs_02.cc
@@ -74,6 +74,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/vectors_rhs_03.cc b/tests/hp/vectors_rhs_03.cc
index 38c9ebf1fe..735d2cd715 100644
--- a/tests/hp/vectors_rhs_03.cc
+++ b/tests/hp/vectors_rhs_03.cc
@@ -73,6 +73,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/vectors_rhs_hp_01.cc b/tests/hp/vectors_rhs_hp_01.cc
index fe6843f983..f2cb7c760b 100644
--- a/tests/hp/vectors_rhs_hp_01.cc
+++ b/tests/hp/vectors_rhs_hp_01.cc
@@ -74,6 +74,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/hp/vectors_rhs_hp_03.cc b/tests/hp/vectors_rhs_hp_03.cc
index a60d7fed59..241169d4b7 100644
--- a/tests/hp/vectors_rhs_hp_03.cc
+++ b/tests/hp/vectors_rhs_hp_03.cc
@@ -73,6 +73,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/lac/filtered_matrix_06.cc b/tests/lac/filtered_matrix_06.cc
index b1a75f4c0d..3605109bfd 100644
--- a/tests/lac/filtered_matrix_06.cc
+++ b/tests/lac/filtered_matrix_06.cc
@@ -104,6 +104,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
 
   tr.refine_global (5-dim);
 
diff --git a/tests/lac/inhomogeneous_constraints_nonsymmetric.cc b/tests/lac/inhomogeneous_constraints_nonsymmetric.cc
index bb0cdfbff3..e9989d0591 100644
--- a/tests/lac/inhomogeneous_constraints_nonsymmetric.cc
+++ b/tests/lac/inhomogeneous_constraints_nonsymmetric.cc
@@ -428,6 +428,7 @@ template <int dim>
 void AdvectionProblem<dim>::run ()
 {
   GridGenerator::hyper_ball (triangulation);
+  triangulation.reset_manifold(0);
   triangulation.refine_global (3-dim);
 
   // manually refine the first two cells
diff --git a/tests/lac/matrices_02.cc b/tests/lac/matrices_02.cc
index 8e9c3cbb5b..3fb7670b02 100644
--- a/tests/lac/matrices_02.cc
+++ b/tests/lac/matrices_02.cc
@@ -127,6 +127,7 @@ check ()
     GridGenerator::hyper_ball(tr, Point<dim>(), 1);
   else
     GridGenerator::hyper_cube(tr, -1,1);
+  tr.reset_manifold(0);
   tr.refine_global (1);
   tr.begin_active()->set_refine_flag ();
   tr.execute_coarsening_and_refinement ();
diff --git a/tests/manifold/polar_manifold_02.cc b/tests/manifold/polar_manifold_02.cc
index 25711da93f..db36463986 100644
--- a/tests/manifold/polar_manifold_02.cc
+++ b/tests/manifold/polar_manifold_02.cc
@@ -37,6 +37,7 @@ void test(unsigned int ref=1)
 
   Triangulation<dim,spacedim> tria;
   GridGenerator::hyper_ball (tria);
+  tria.reset_manifold(0);
 
   typename Triangulation<dim,spacedim>::active_cell_iterator cell;
 
diff --git a/tests/manifold/transfinite_manifold_02.cc b/tests/manifold/transfinite_manifold_02.cc
index 3a7c6df9b8..5eb6c86a02 100644
--- a/tests/manifold/transfinite_manifold_02.cc
+++ b/tests/manifold/transfinite_manifold_02.cc
@@ -18,6 +18,7 @@
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/manifold_lib.h>
 
 
@@ -29,11 +30,19 @@ void do_test(const Triangulation<dim,spacedim> &tria)
     {
       deallog << "Lines on cell with center: " << cell->center() << std::endl;
       for (unsigned int line=0; line<GeometryInfo<dim>::lines_per_cell; ++line)
-        deallog << cell->line(line)->center(/*respect_manifold=*/true) << std::endl;
+        {
+          deallog << cell->line(line)->center(/*respect_manifold=*/true) << std::endl;
+          deallog << "Manifold id: " << cell->line(line)->manifold_id() << std::endl;
+        }
       deallog << "Faces on cell with center: " << cell->center() << std::endl;
       for (unsigned int face=0; face<GeometryInfo<dim>::faces_per_cell; ++face)
-        deallog << cell->face(face)->center(/*respect_manifold=*/true) << std::endl;
+        {
+          deallog << cell->face(face)->center(/*respect_manifold=*/true) << std::endl;
+          deallog << "Manifold id: " << cell->face(face)->manifold_id() << std::endl;
+        }
+
       deallog << "Center with manifold: " << cell->center(true) << std::endl;
+      deallog << "Manifold id: " << cell->manifold_id() << std::endl;
       for (unsigned int face=0; face<GeometryInfo<dim>::faces_per_cell; ++face)
         if (cell->at_boundary(face))
           {
@@ -49,6 +58,7 @@ void do_test(const Triangulation<dim,spacedim> &tria)
                                    make_array_view(weights));
             deallog << "Distance between cell manifold and face manifold: "
                     << (pref-p) << std::endl;
+            Assert ((pref-p).norm() < 1e-6, ExcInternalError());
             weights[0] = 0.55;
             weights[1] = 0.45;
             p = cell->get_manifold().get_new_point(make_array_view(points),
@@ -57,6 +67,7 @@ void do_test(const Triangulation<dim,spacedim> &tria)
                                                                   make_array_view(weights));
             deallog << "Distance between cell manifold and face manifold: "
                     << (pref-p) << std::endl;
+            Assert ((pref-p).norm() < 1e-6, ExcInternalError());
           }
     }
   deallog << std::endl;
@@ -73,6 +84,7 @@ void test_polar()
 
   Triangulation<dim,spacedim> tria;
   GridGenerator::hyper_ball (tria);
+  tria.set_all_manifold_ids(numbers::flat_manifold_id);
 
   // set all cells at the boundary to the transfinite manifold except for the
   // boundaries where we put the polar manifold
@@ -100,6 +112,7 @@ void test_spherical()
 
   Triangulation<dim,spacedim> tria;
   GridGenerator::hyper_ball (tria);
+  tria.set_all_manifold_ids(numbers::flat_manifold_id);
 
   // set all cells at the boundary to the transfinite manifold except for the
   // boundaries where we put the polar manifold
@@ -125,12 +138,14 @@ void test_cylinder(unsigned int ref=1)
   TransfiniteInterpolationManifold<dim,spacedim> manifold;
   Triangulation<dim,spacedim> tria;
   GridGenerator::cylinder (tria);
+  tria.reset_all_manifolds();
+  tria.set_all_manifold_ids(numbers::flat_manifold_id);
 
   for (typename Triangulation<dim,spacedim>::active_cell_iterator
        cell=tria.begin_active(); cell!=tria.end(); ++cell)
     {
       if (cell->at_boundary())
-        cell->set_manifold_id(1);
+        cell->set_all_manifold_ids(1);
       for (unsigned int face=0; face<GeometryInfo<dim>::faces_per_cell; ++face)
         if (cell->at_boundary(face))
           {
diff --git a/tests/manifold/transfinite_manifold_02.output b/tests/manifold/transfinite_manifold_02.output
index a5b642cdc5..16ceb78898 100644
--- a/tests/manifold/transfinite_manifold_02.output
+++ b/tests/manifold/transfinite_manifold_02.output
@@ -2,539 +2,952 @@
 DEAL::Testing with PolarManifold dim=2, spacedim=2
 DEAL::Lines on cell with center: 0.00000 -0.500000
 DEAL::-0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::-1.83697e-16 -1.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 -0.292893
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: 0.00000 -0.500000
 DEAL::-0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::-1.83697e-16 -1.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 -0.292893
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: -9.71445e-17 -0.646447
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Lines on cell with center: -0.500000 -1.38778e-17
 DEAL::-1.00000 1.22465e-16
+DEAL::Manifold id: 0
 DEAL::-0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::-0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::-0.500000 0.500000
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: -0.500000 -1.38778e-17
 DEAL::-1.00000 1.22465e-16
+DEAL::Manifold id: 0
 DEAL::-0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::-0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::-0.500000 0.500000
-DEAL::Center with manifold: -0.646447 4.16334e-17
+DEAL::Manifold id: 4294967295
+DEAL::Center with manifold: -0.646447 5.55112e-17
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Lines on cell with center: 0.00000 0.00000
 DEAL::-0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -0.292893
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.292893
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: 0.00000 0.00000
 DEAL::-0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -0.292893
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.292893
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: 0.00000 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::Lines on cell with center: 0.500000 0.00000
 DEAL::0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::0.500000 0.500000
+DEAL::Manifold id: 4294967295
 DEAL::1.00000 0.00000
+DEAL::Manifold id: 0
 DEAL::0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: 0.500000 0.00000
 DEAL::0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::0.500000 0.500000
+DEAL::Manifold id: 4294967295
 DEAL::1.00000 0.00000
+DEAL::Manifold id: 0
 DEAL::0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: 0.646447 0.00000
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Lines on cell with center: -1.38778e-17 0.500000
 DEAL::6.12323e-17 1.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 0.292893
+DEAL::Manifold id: 4294967295
 DEAL::-0.500000 0.500000
+DEAL::Manifold id: 4294967295
 DEAL::0.500000 0.500000
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: -1.38778e-17 0.500000
 DEAL::6.12323e-17 1.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 0.292893
+DEAL::Manifold id: 4294967295
 DEAL::-0.500000 0.500000
+DEAL::Manifold id: 4294967295
 DEAL::0.500000 0.500000
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: 2.77556e-17 0.646447
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::
 DEAL::Testing with SphericalManifold dim=2, spacedim=2
 DEAL::Lines on cell with center: 0.00000 -0.500000
 DEAL::-0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::-1.11022e-16 -1.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 -0.292893
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: 0.00000 -0.500000
 DEAL::-0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::-1.11022e-16 -1.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 -0.292893
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: -5.55112e-17 -0.646447
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Lines on cell with center: -0.500000 -1.38778e-17
 DEAL::-1.00000 -1.11022e-16
+DEAL::Manifold id: 0
 DEAL::-0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::-0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::-0.500000 0.500000
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: -0.500000 -1.38778e-17
 DEAL::-1.00000 -1.11022e-16
+DEAL::Manifold id: 0
 DEAL::-0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::-0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::-0.500000 0.500000
-DEAL::Center with manifold: -0.646447 -1.29480e-14
+DEAL::Manifold id: 4294967295
+DEAL::Center with manifold: -0.646447 -5.55112e-17
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Lines on cell with center: 0.00000 0.00000
 DEAL::-0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -0.292893
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.292893
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: 0.00000 0.00000
 DEAL::-0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -0.292893
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.292893
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: 0.00000 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::Lines on cell with center: 0.500000 0.00000
 DEAL::0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::0.500000 0.500000
+DEAL::Manifold id: 4294967295
 DEAL::1.00000 -1.11022e-16
+DEAL::Manifold id: 0
 DEAL::0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: 0.500000 0.00000
 DEAL::0.500000 -0.500000
+DEAL::Manifold id: 4294967295
 DEAL::0.500000 0.500000
+DEAL::Manifold id: 4294967295
 DEAL::1.00000 -1.11022e-16
+DEAL::Manifold id: 0
 DEAL::0.292893 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: 0.646447 -5.55112e-17
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Lines on cell with center: -1.38778e-17 0.500000
 DEAL::-1.11022e-16 1.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 0.292893
+DEAL::Manifold id: 4294967295
 DEAL::-0.500000 0.500000
+DEAL::Manifold id: 4294967295
 DEAL::0.500000 0.500000
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: -1.38778e-17 0.500000
 DEAL::-1.11022e-16 1.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 0.292893
+DEAL::Manifold id: 4294967295
 DEAL::-0.500000 0.500000
+DEAL::Manifold id: 4294967295
 DEAL::0.500000 0.500000
-DEAL::Center with manifold: -1.29480e-14 0.646447
+DEAL::Manifold id: 4294967295
+DEAL::Center with manifold: -5.55112e-17 0.646447
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000
 DEAL::
 DEAL::Testing with SphericalManifold dim=3, spacedim=3
 DEAL::Lines on cell with center: 0.00000 0.00000 -6.93889e-18
 DEAL::-0.211325 0.00000 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.211325 0.00000 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -0.211325 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.211325 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::-0.211325 0.00000 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.211325 0.00000 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -0.211325 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.211325 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::-0.211325 -0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.211325 -0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::-0.211325 0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.211325 0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: 0.00000 0.00000 -6.93889e-18
 DEAL::-0.211325 0.00000 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.211325 0.00000 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.00000 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.00000 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: 0.00000 0.00000 -1.38778e-17
+DEAL::Manifold id: 4294967295
 DEAL::Lines on cell with center: 0.00000 0.00000 -0.394338
 DEAL::-0.707107 0.00000 -0.707107
+DEAL::Manifold id: 0
 DEAL::0.707107 0.00000 -0.707107
+DEAL::Manifold id: 0
 DEAL::0.00000 -0.707107 -0.707107
+DEAL::Manifold id: 0
 DEAL::0.00000 0.707107 -0.707107
+DEAL::Manifold id: 0
 DEAL::-0.211325 0.00000 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.211325 0.00000 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -0.211325 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.211325 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::-0.394338 -0.394338 -0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.394338 -0.394338 -0.394338
+DEAL::Manifold id: 4294967295
 DEAL::-0.394338 0.394338 -0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.394338 0.394338 -0.394338
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: 0.00000 0.00000 -0.394338
 DEAL::-0.410557 0.00000 -0.410557
+DEAL::Manifold id: 4294967295
 DEAL::0.410557 0.00000 -0.410557
+DEAL::Manifold id: 4294967295
 DEAL::6.93889e-18 -0.410557 -0.410557
+DEAL::Manifold id: 4294967295
 DEAL::6.93889e-18 0.410557 -0.410557
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.00000 -1.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 0.00000 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: -1.94289e-16 2.37914e-13 -0.450853
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: -5.55112e-17 0.00000 0.00000
-DEAL::Distance between cell manifold and face manifold: -6.93889e-18 0.00000 0.00000
+DEAL::Distance between cell manifold and face manifold: 1.38778e-17 0.00000 0.00000
 DEAL::Lines on cell with center: 0.394338 0.00000 2.08167e-17
 DEAL::0.394338 -0.394338 -0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.394338 0.394338 -0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.707107 0.00000 -0.707107
+DEAL::Manifold id: 0
 DEAL::0.211325 0.00000 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.394338 -0.394338 0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.394338 0.394338 0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.707107 0.00000 0.707107
+DEAL::Manifold id: 0
 DEAL::0.211325 0.00000 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.707107 -0.707107 0.00000
+DEAL::Manifold id: 0
 DEAL::0.707107 0.707107 0.00000
+DEAL::Manifold id: 0
 DEAL::0.211325 -0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.211325 0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: 0.394338 0.00000 2.08167e-17
 DEAL::0.410557 -0.410557 6.93889e-18
+DEAL::Manifold id: 4294967295
 DEAL::0.410557 0.410557 6.93889e-18
+DEAL::Manifold id: 4294967295
 DEAL::1.00000 0.00000 0.00000
+DEAL::Manifold id: 0
 DEAL::0.211325 0.00000 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.410557 0.00000 -0.410557
+DEAL::Manifold id: 4294967295
 DEAL::0.410557 0.00000 0.410557
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: 0.450853 1.19127e-13 0.00000
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: 1.11022e-16 -1.11022e-16 5.55112e-17
-DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 -6.93889e-18
+DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 6.24500e-17
 DEAL::Lines on cell with center: 0.00000 2.08167e-17 0.394338
 DEAL::-0.394338 -0.394338 0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.394338 -0.394338 0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -0.707107 0.707107
+DEAL::Manifold id: 0
 DEAL::0.00000 -0.211325 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::-0.394338 0.394338 0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.394338 0.394338 0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.707107 0.707107
+DEAL::Manifold id: 0
 DEAL::0.00000 0.211325 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::-0.707107 0.00000 0.707107
+DEAL::Manifold id: 0
 DEAL::0.707107 0.00000 0.707107
+DEAL::Manifold id: 0
 DEAL::-0.211325 0.00000 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.211325 0.00000 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: 0.00000 2.08167e-17 0.394338
 DEAL::-0.410557 6.93889e-18 0.410557
+DEAL::Manifold id: 4294967295
 DEAL::0.410557 0.00000 0.410557
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.00000 1.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 0.00000 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -0.410557 0.410557
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.410557 0.410557
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: 1.19127e-13 0.00000 0.450853
-DEAL::Distance between cell manifold and face manifold: -1.11022e-16 0.00000 1.11022e-16
-DEAL::Distance between cell manifold and face manifold: 0.00000 -6.93889e-18 0.00000
+DEAL::Manifold id: 1
+DEAL::Distance between cell manifold and face manifold: -1.11022e-16 5.55112e-17 1.11022e-16
+DEAL::Distance between cell manifold and face manifold: 0.00000 6.93889e-17 0.00000
 DEAL::Lines on cell with center: -0.394338 3.46945e-18 1.73472e-17
 DEAL::-0.707107 0.00000 -0.707107
+DEAL::Manifold id: 0
 DEAL::-0.211325 0.00000 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::-0.394338 -0.394338 -0.394338
+DEAL::Manifold id: 4294967295
 DEAL::-0.394338 0.394338 -0.394338
+DEAL::Manifold id: 4294967295
 DEAL::-0.707107 0.00000 0.707107
+DEAL::Manifold id: 0
 DEAL::-0.211325 0.00000 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::-0.394338 -0.394338 0.394338
+DEAL::Manifold id: 4294967295
 DEAL::-0.394338 0.394338 0.394338
+DEAL::Manifold id: 4294967295
 DEAL::-0.707107 -0.707107 0.00000
+DEAL::Manifold id: 0
 DEAL::-0.211325 -0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::-0.707107 0.707107 0.00000
+DEAL::Manifold id: 0
 DEAL::-0.211325 0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: -0.394338 3.46945e-18 1.73472e-17
 DEAL::-1.00000 0.00000 0.00000
+DEAL::Manifold id: 0
 DEAL::-0.211325 0.00000 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::-0.410557 -0.410557 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::-0.410557 0.410557 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::-0.410557 0.00000 -0.410557
+DEAL::Manifold id: 4294967295
 DEAL::-0.410557 6.93889e-18 0.410557
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: -0.450853 1.19113e-13 -6.93889e-18
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: 0.00000 -5.55112e-17 0.00000
-DEAL::Distance between cell manifold and face manifold: 0.00000 -6.93889e-18 0.00000
+DEAL::Distance between cell manifold and face manifold: 0.00000 1.38778e-17 0.00000
 DEAL::Lines on cell with center: 0.00000 -0.394338 2.08167e-17
 DEAL::-0.394338 -0.394338 -0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.394338 -0.394338 -0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -0.707107 -0.707107
+DEAL::Manifold id: 0
 DEAL::0.00000 -0.211325 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::-0.394338 -0.394338 0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.394338 -0.394338 0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -0.707107 0.707107
+DEAL::Manifold id: 0
 DEAL::0.00000 -0.211325 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::-0.707107 -0.707107 0.00000
+DEAL::Manifold id: 0
 DEAL::0.707107 -0.707107 0.00000
+DEAL::Manifold id: 0
 DEAL::-0.211325 -0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.211325 -0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: 0.00000 -0.394338 2.08167e-17
 DEAL::-0.410557 -0.410557 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.410557 -0.410557 6.93889e-18
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -1.00000 0.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 -0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::6.93889e-18 -0.410557 -0.410557
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 -0.410557 0.410557
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: 1.19127e-13 -0.450853 0.00000
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: -1.11022e-16 -1.11022e-16 5.55112e-17
-DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 -6.93889e-18
+DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 6.24500e-17
 DEAL::Lines on cell with center: 3.46945e-18 0.394338 1.73472e-17
 DEAL::0.00000 0.707107 -0.707107
+DEAL::Manifold id: 0
 DEAL::0.00000 0.211325 -0.211325
+DEAL::Manifold id: 4294967295
 DEAL::-0.394338 0.394338 -0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.394338 0.394338 -0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.707107 0.707107
+DEAL::Manifold id: 0
 DEAL::0.00000 0.211325 0.211325
+DEAL::Manifold id: 4294967295
 DEAL::-0.394338 0.394338 0.394338
+DEAL::Manifold id: 4294967295
 DEAL::0.394338 0.394338 0.394338
+DEAL::Manifold id: 4294967295
 DEAL::-0.707107 0.707107 0.00000
+DEAL::Manifold id: 0
 DEAL::-0.211325 0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.707107 0.707107 0.00000
+DEAL::Manifold id: 0
 DEAL::0.211325 0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::Faces on cell with center: 3.46945e-18 0.394338 1.73472e-17
 DEAL::0.00000 1.00000 0.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 0.211325 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::-0.410557 0.410557 0.00000
+DEAL::Manifold id: 4294967295
 DEAL::0.410557 0.410557 6.93889e-18
+DEAL::Manifold id: 4294967295
 DEAL::6.93889e-18 0.410557 -0.410557
+DEAL::Manifold id: 4294967295
 DEAL::0.00000 0.410557 0.410557
+DEAL::Manifold id: 4294967295
 DEAL::Center with manifold: 1.19113e-13 0.450853 -6.93889e-18
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: -5.55112e-17 0.00000 0.00000
-DEAL::Distance between cell manifold and face manifold: -6.93889e-18 0.00000 0.00000
+DEAL::Distance between cell manifold and face manifold: 1.38778e-17 0.00000 0.00000
 DEAL::
 DEAL::Testing with CylindricalManifold in 3d
 DEAL::Lines on cell with center: -0.500000 0.00000 -0.500000
 DEAL::-0.500000 0.707107 -0.707107
+DEAL::Manifold id: 0
 DEAL::-0.500000 -0.707107 -0.707107
-DEAL::-1.00000 -7.85046e-17 -1.00000
-DEAL::0.00000 -7.85046e-17 -1.00000
+DEAL::Manifold id: 0
+DEAL::-1.00000 -5.55112e-17 -1.00000
+DEAL::Manifold id: 0
+DEAL::0.00000 -5.55112e-17 -1.00000
+DEAL::Manifold id: 0
 DEAL::-0.500000 0.292893 -0.292893
+DEAL::Manifold id: 1
 DEAL::-0.500000 -0.292893 -0.292893
+DEAL::Manifold id: 1
 DEAL::-1.00000 0.00000 -0.292893
+DEAL::Manifold id: 1
 DEAL::0.00000 0.00000 -0.292893
+DEAL::Manifold id: 1
 DEAL::-1.00000 0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::-1.00000 -0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::0.00000 0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::0.00000 -0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::Faces on cell with center: -0.500000 0.00000 -0.500000
 DEAL::-0.500000 0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::-0.500000 -0.500000 -0.500000
-DEAL::-1.00000 3.33067e-15 -0.646447
-DEAL::0.00000 0.00000 -0.536612
-DEAL::-0.500000 -7.85046e-17 -1.00000
+DEAL::Manifold id: 1
+DEAL::-1.00000 3.28904e-15 -0.646447
+DEAL::Manifold id: 1
+DEAL::0.00000 3.28904e-15 -0.646447
+DEAL::Manifold id: 1
+DEAL::-0.500000 -5.55112e-17 -1.00000
+DEAL::Manifold id: 0
 DEAL::-0.500000 0.00000 -0.292893
-DEAL::Center with manifold: -0.500000 1.54737e-15 -0.591529
+DEAL::Manifold id: 1
+DEAL::Center with manifold: -0.500000 3.26822e-15 -0.646447
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
-DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 -2.22045e-16
+DEAL::Distance between cell manifold and face manifold: 0.00000 1.11022e-16 -1.11022e-16
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Lines on cell with center: -0.500000 0.500000 -6.93889e-18
 DEAL::-0.500000 0.707107 -0.707107
+DEAL::Manifold id: 0
 DEAL::-0.500000 0.292893 -0.292893
+DEAL::Manifold id: 1
 DEAL::-1.00000 0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::0.00000 0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::-0.500000 0.707107 0.707107
+DEAL::Manifold id: 0
 DEAL::-0.500000 0.292893 0.292893
+DEAL::Manifold id: 1
 DEAL::-1.00000 0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::0.00000 0.500000 0.500000
-DEAL::-1.00000 1.00000 -7.85046e-17
+DEAL::Manifold id: 1
+DEAL::-1.00000 1.00000 -5.55112e-17
+DEAL::Manifold id: 0
 DEAL::-1.00000 0.292893 6.93889e-18
-DEAL::0.00000 1.00000 -7.85046e-17
-DEAL::0.00000 0.292893 0.00000
+DEAL::Manifold id: 1
+DEAL::0.00000 1.00000 -5.55112e-17
+DEAL::Manifold id: 0
+DEAL::0.00000 0.292893 6.93889e-18
+DEAL::Manifold id: 1
 DEAL::Faces on cell with center: -0.500000 0.500000 -6.93889e-18
-DEAL::-0.500000 1.00000 -7.85046e-17
-DEAL::-0.500000 0.292893 0.00000
-DEAL::-1.00000 0.646447 -4.16334e-17
-DEAL::0.00000 0.536612 -9.81308e-18
+DEAL::-0.500000 1.00000 -5.55112e-17
+DEAL::Manifold id: 0
+DEAL::-0.500000 0.292893 3.46945e-18
+DEAL::Manifold id: 1
+DEAL::-1.00000 0.646447 -2.77556e-17
+DEAL::Manifold id: 1
+DEAL::0.00000 0.646447 -2.77556e-17
+DEAL::Manifold id: 1
 DEAL::-0.500000 0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::-0.500000 0.500000 0.500000
-DEAL::Center with manifold: -0.500000 0.591529 -2.77556e-17
+DEAL::Manifold id: 1
+DEAL::Center with manifold: -0.500000 0.646447 -2.77556e-17
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: -2.77556e-17 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Lines on cell with center: -0.500000 0.00000 1.38778e-17
 DEAL::-0.500000 0.292893 -0.292893
+DEAL::Manifold id: 1
 DEAL::-0.500000 -0.292893 -0.292893
+DEAL::Manifold id: 1
 DEAL::-1.00000 0.00000 -0.292893
+DEAL::Manifold id: 1
 DEAL::0.00000 0.00000 -0.292893
+DEAL::Manifold id: 1
 DEAL::-0.500000 0.292893 0.292893
+DEAL::Manifold id: 1
 DEAL::-0.500000 -0.292893 0.292893
+DEAL::Manifold id: 1
 DEAL::-1.00000 0.00000 0.292893
+DEAL::Manifold id: 1
 DEAL::0.00000 0.00000 0.292893
+DEAL::Manifold id: 1
 DEAL::-1.00000 0.292893 6.93889e-18
+DEAL::Manifold id: 1
 DEAL::-1.00000 -0.292893 0.00000
-DEAL::0.00000 0.292893 0.00000
+DEAL::Manifold id: 1
+DEAL::0.00000 0.292893 6.93889e-18
+DEAL::Manifold id: 1
 DEAL::0.00000 -0.292893 0.00000
+DEAL::Manifold id: 1
 DEAL::Faces on cell with center: -0.500000 0.00000 1.38778e-17
-DEAL::-0.500000 0.292893 0.00000
+DEAL::-0.500000 0.292893 3.46945e-18
+DEAL::Manifold id: 1
 DEAL::-0.500000 -0.292893 0.00000
+DEAL::Manifold id: 1
 DEAL::-1.00000 0.00000 0.00000
+DEAL::Manifold id: 1
 DEAL::0.00000 0.00000 0.00000
+DEAL::Manifold id: 1
 DEAL::-0.500000 0.00000 -0.292893
+DEAL::Manifold id: 1
 DEAL::-0.500000 0.00000 0.292893
+DEAL::Manifold id: 1
 DEAL::Center with manifold: -0.500000 0.00000 1.38778e-17
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Lines on cell with center: -0.500000 -0.500000 0.00000
 DEAL::-0.500000 -0.707107 -0.707107
+DEAL::Manifold id: 0
 DEAL::-0.500000 -0.707107 0.707107
-DEAL::-1.00000 -1.00000 2.35514e-16
-DEAL::0.00000 -1.00000 2.35514e-16
+DEAL::Manifold id: 0
+DEAL::-1.00000 -1.00000 2.22045e-16
+DEAL::Manifold id: 0
+DEAL::0.00000 -1.00000 2.22045e-16
+DEAL::Manifold id: 0
 DEAL::-0.500000 -0.292893 -0.292893
+DEAL::Manifold id: 1
 DEAL::-0.500000 -0.292893 0.292893
+DEAL::Manifold id: 1
 DEAL::-1.00000 -0.292893 0.00000
+DEAL::Manifold id: 1
 DEAL::0.00000 -0.292893 0.00000
+DEAL::Manifold id: 1
 DEAL::-1.00000 -0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::-1.00000 -0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::0.00000 -0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::0.00000 -0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::Faces on cell with center: -0.500000 -0.500000 0.00000
 DEAL::-0.500000 -0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::-0.500000 -0.500000 0.500000
-DEAL::-1.00000 -0.646447 -2.99760e-15
-DEAL::0.00000 -0.536612 2.08167e-17
-DEAL::-0.500000 -1.00000 2.35514e-16
+DEAL::Manifold id: 1
+DEAL::-1.00000 -0.646447 -3.02536e-15
+DEAL::Manifold id: 1
+DEAL::0.00000 -0.646447 -3.02536e-15
+DEAL::Manifold id: 1
+DEAL::-0.500000 -1.00000 2.22045e-16
+DEAL::Manifold id: 0
 DEAL::-0.500000 -0.292893 0.00000
-DEAL::Center with manifold: -0.500000 -0.591529 -1.51268e-15
+DEAL::Manifold id: 1
+DEAL::Center with manifold: -0.500000 -0.646447 -2.92127e-15
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Lines on cell with center: -0.500000 6.93889e-18 0.500000
 DEAL::-0.500000 0.707107 0.707107
+DEAL::Manifold id: 0
 DEAL::-0.500000 0.292893 0.292893
+DEAL::Manifold id: 1
 DEAL::-1.00000 0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::0.00000 0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::-0.500000 -0.707107 0.707107
+DEAL::Manifold id: 0
 DEAL::-0.500000 -0.292893 0.292893
+DEAL::Manifold id: 1
 DEAL::-1.00000 -0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::0.00000 -0.500000 0.500000
-DEAL::-1.00000 1.57009e-16 1.00000
+DEAL::Manifold id: 1
+DEAL::-1.00000 1.66533e-16 1.00000
+DEAL::Manifold id: 0
 DEAL::-1.00000 0.00000 0.292893
-DEAL::0.00000 1.57009e-16 1.00000
+DEAL::Manifold id: 1
+DEAL::0.00000 1.66533e-16 1.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 0.00000 0.292893
+DEAL::Manifold id: 1
 DEAL::Faces on cell with center: -0.500000 6.93889e-18 0.500000
-DEAL::-0.500000 1.57009e-16 1.00000
+DEAL::-0.500000 4.99600e-16 1.00000
+DEAL::Manifold id: 0
 DEAL::-0.500000 0.00000 0.292893
+DEAL::Manifold id: 1
 DEAL::-1.00000 8.32667e-17 0.646447
-DEAL::0.00000 1.96262e-17 0.536612
+DEAL::Manifold id: 1
+DEAL::0.00000 8.32667e-17 0.646447
+DEAL::Manifold id: 1
 DEAL::-0.500000 0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::-0.500000 -0.500000 0.500000
-DEAL::Center with manifold: -0.500000 -1.24900e-16 0.591529
+DEAL::Manifold id: 1
+DEAL::Center with manifold: -0.500000 2.84495e-16 0.646447
+DEAL::Manifold id: 1
 DEAL::Distance between cell manifold and face manifold: -2.77556e-17 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Lines on cell with center: 0.500000 0.00000 -0.500000
 DEAL::0.500000 0.707107 -0.707107
+DEAL::Manifold id: 0
 DEAL::0.500000 -0.707107 -0.707107
-DEAL::0.00000 -7.85046e-17 -1.00000
-DEAL::1.00000 -7.85046e-17 -1.00000
+DEAL::Manifold id: 0
+DEAL::0.00000 -5.55112e-17 -1.00000
+DEAL::Manifold id: 0
+DEAL::1.00000 -5.55112e-17 -1.00000
+DEAL::Manifold id: 0
 DEAL::0.500000 0.292893 -0.292893
+DEAL::Manifold id: 1
 DEAL::0.500000 -0.292893 -0.292893
+DEAL::Manifold id: 1
 DEAL::0.00000 0.00000 -0.292893
+DEAL::Manifold id: 1
 DEAL::1.00000 0.00000 -0.292893
+DEAL::Manifold id: 1
 DEAL::0.00000 0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::0.00000 -0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::1.00000 0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::1.00000 -0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::Faces on cell with center: 0.500000 0.00000 -0.500000
 DEAL::0.500000 0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::0.500000 -0.500000 -0.500000
-DEAL::0.00000 0.00000 -0.536612
-DEAL::1.00000 0.00000 -0.536612
-DEAL::0.500000 -7.85046e-17 -1.00000
+DEAL::Manifold id: 1
+DEAL::0.00000 3.28904e-15 -0.646447
+DEAL::Manifold id: 1
+DEAL::1.00000 3.28904e-15 -0.646447
+DEAL::Manifold id: 1
+DEAL::0.500000 -5.55112e-17 -1.00000
+DEAL::Manifold id: 0
 DEAL::0.500000 0.00000 -0.292893
-DEAL::Center with manifold: 0.500000 -2.77556e-17 -0.536612
-DEAL::Distance between cell manifold and face manifold: -2.22045e-16 -5.55112e-17 1.11022e-16
-DEAL::Distance between cell manifold and face manifold: -2.22045e-16 0.00000 0.00000
-DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 -2.22045e-16
+DEAL::Manifold id: 1
+DEAL::Center with manifold: 0.500000 3.26822e-15 -0.646447
+DEAL::Manifold id: 1
+DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
+DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
+DEAL::Distance between cell manifold and face manifold: 0.00000 1.11022e-16 -1.11022e-16
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Lines on cell with center: 0.500000 0.500000 -6.93889e-18
 DEAL::0.500000 0.707107 -0.707107
+DEAL::Manifold id: 0
 DEAL::0.500000 0.292893 -0.292893
+DEAL::Manifold id: 1
 DEAL::0.00000 0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::1.00000 0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::0.500000 0.707107 0.707107
+DEAL::Manifold id: 0
 DEAL::0.500000 0.292893 0.292893
+DEAL::Manifold id: 1
 DEAL::0.00000 0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::1.00000 0.500000 0.500000
-DEAL::0.00000 1.00000 -7.85046e-17
-DEAL::0.00000 0.292893 0.00000
-DEAL::1.00000 1.00000 -7.85046e-17
-DEAL::1.00000 0.292893 0.00000
+DEAL::Manifold id: 1
+DEAL::0.00000 1.00000 -5.55112e-17
+DEAL::Manifold id: 0
+DEAL::0.00000 0.292893 6.93889e-18
+DEAL::Manifold id: 1
+DEAL::1.00000 1.00000 -5.55112e-17
+DEAL::Manifold id: 0
+DEAL::1.00000 0.292893 6.93889e-18
+DEAL::Manifold id: 1
 DEAL::Faces on cell with center: 0.500000 0.500000 -6.93889e-18
-DEAL::0.500000 1.00000 -7.85046e-17
-DEAL::0.500000 0.292893 0.00000
-DEAL::0.00000 0.536612 -9.81308e-18
-DEAL::1.00000 0.536612 -9.81308e-18
+DEAL::0.500000 1.00000 -5.55112e-17
+DEAL::Manifold id: 0
+DEAL::0.500000 0.292893 3.46945e-18
+DEAL::Manifold id: 1
+DEAL::0.00000 0.646447 -2.77556e-17
+DEAL::Manifold id: 1
+DEAL::1.00000 0.646447 -2.77556e-17
+DEAL::Manifold id: 1
 DEAL::0.500000 0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::0.500000 0.500000 0.500000
-DEAL::Center with manifold: 0.500000 0.536612 -2.77556e-17
+DEAL::Manifold id: 1
+DEAL::Center with manifold: 0.500000 0.646447 -2.77556e-17
+DEAL::Manifold id: 1
+DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
+DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
-DEAL::Distance between cell manifold and face manifold: 0.00000 -0.101910 -0.0220998
-DEAL::Distance between cell manifold and face manifold: 0.00000 -0.289811 0.00774842
 DEAL::Lines on cell with center: 0.500000 0.00000 1.38778e-17
 DEAL::0.500000 0.292893 -0.292893
+DEAL::Manifold id: 1
 DEAL::0.500000 -0.292893 -0.292893
+DEAL::Manifold id: 1
 DEAL::0.00000 0.00000 -0.292893
+DEAL::Manifold id: 1
 DEAL::1.00000 0.00000 -0.292893
+DEAL::Manifold id: 1
 DEAL::0.500000 0.292893 0.292893
+DEAL::Manifold id: 1
 DEAL::0.500000 -0.292893 0.292893
+DEAL::Manifold id: 1
 DEAL::0.00000 0.00000 0.292893
+DEAL::Manifold id: 1
 DEAL::1.00000 0.00000 0.292893
-DEAL::0.00000 0.292893 0.00000
+DEAL::Manifold id: 1
+DEAL::0.00000 0.292893 6.93889e-18
+DEAL::Manifold id: 1
 DEAL::0.00000 -0.292893 0.00000
-DEAL::1.00000 0.292893 0.00000
+DEAL::Manifold id: 1
+DEAL::1.00000 0.292893 6.93889e-18
+DEAL::Manifold id: 1
 DEAL::1.00000 -0.292893 0.00000
+DEAL::Manifold id: 1
 DEAL::Faces on cell with center: 0.500000 0.00000 1.38778e-17
-DEAL::0.500000 0.292893 0.00000
+DEAL::0.500000 0.292893 3.46945e-18
+DEAL::Manifold id: 1
 DEAL::0.500000 -0.292893 0.00000
+DEAL::Manifold id: 1
 DEAL::0.00000 0.00000 0.00000
+DEAL::Manifold id: 1
 DEAL::1.00000 0.00000 0.00000
+DEAL::Manifold id: 1
 DEAL::0.500000 0.00000 -0.292893
+DEAL::Manifold id: 1
 DEAL::0.500000 0.00000 0.292893
+DEAL::Manifold id: 1
 DEAL::Center with manifold: 0.500000 0.00000 1.38778e-17
+DEAL::Manifold id: 1
+DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
-DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 -6.93889e-18
 DEAL::Lines on cell with center: 0.500000 -0.500000 0.00000
 DEAL::0.500000 -0.707107 -0.707107
+DEAL::Manifold id: 0
 DEAL::0.500000 -0.707107 0.707107
-DEAL::0.00000 -1.00000 2.35514e-16
-DEAL::1.00000 -1.00000 2.35514e-16
+DEAL::Manifold id: 0
+DEAL::0.00000 -1.00000 2.22045e-16
+DEAL::Manifold id: 0
+DEAL::1.00000 -1.00000 2.22045e-16
+DEAL::Manifold id: 0
 DEAL::0.500000 -0.292893 -0.292893
+DEAL::Manifold id: 1
 DEAL::0.500000 -0.292893 0.292893
+DEAL::Manifold id: 1
 DEAL::0.00000 -0.292893 0.00000
+DEAL::Manifold id: 1
 DEAL::1.00000 -0.292893 0.00000
+DEAL::Manifold id: 1
 DEAL::0.00000 -0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::0.00000 -0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::1.00000 -0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::1.00000 -0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::Faces on cell with center: 0.500000 -0.500000 0.00000
 DEAL::0.500000 -0.500000 -0.500000
+DEAL::Manifold id: 1
 DEAL::0.500000 -0.500000 0.500000
-DEAL::0.00000 -0.536612 2.08167e-17
-DEAL::1.00000 -0.536612 2.08167e-17
-DEAL::0.500000 -1.00000 2.35514e-16
+DEAL::Manifold id: 1
+DEAL::0.00000 -0.646447 -3.02536e-15
+DEAL::Manifold id: 1
+DEAL::1.00000 -0.646447 -3.02536e-15
+DEAL::Manifold id: 1
+DEAL::0.500000 -1.00000 2.22045e-16
+DEAL::Manifold id: 0
 DEAL::0.500000 -0.292893 0.00000
-DEAL::Center with manifold: 0.500000 -0.536612 5.55112e-17
-DEAL::Distance between cell manifold and face manifold: 0.00000 -5.55112e-17 -5.55112e-17
-DEAL::Distance between cell manifold and face manifold: 0.00000 -1.11022e-16 -1.11022e-16
+DEAL::Manifold id: 1
+DEAL::Center with manifold: 0.500000 -0.646447 -2.92127e-15
+DEAL::Manifold id: 1
+DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
+DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Lines on cell with center: 0.500000 6.93889e-18 0.500000
 DEAL::0.500000 0.707107 0.707107
+DEAL::Manifold id: 0
 DEAL::0.500000 0.292893 0.292893
+DEAL::Manifold id: 1
 DEAL::0.00000 0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::1.00000 0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::0.500000 -0.707107 0.707107
+DEAL::Manifold id: 0
 DEAL::0.500000 -0.292893 0.292893
+DEAL::Manifold id: 1
 DEAL::0.00000 -0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::1.00000 -0.500000 0.500000
-DEAL::0.00000 1.57009e-16 1.00000
+DEAL::Manifold id: 1
+DEAL::0.00000 1.66533e-16 1.00000
+DEAL::Manifold id: 0
 DEAL::0.00000 0.00000 0.292893
-DEAL::1.00000 1.57009e-16 1.00000
+DEAL::Manifold id: 1
+DEAL::1.00000 1.66533e-16 1.00000
+DEAL::Manifold id: 0
 DEAL::1.00000 0.00000 0.292893
+DEAL::Manifold id: 1
 DEAL::Faces on cell with center: 0.500000 6.93889e-18 0.500000
-DEAL::0.500000 1.57009e-16 1.00000
+DEAL::0.500000 4.99600e-16 1.00000
+DEAL::Manifold id: 0
 DEAL::0.500000 0.00000 0.292893
-DEAL::0.00000 1.96262e-17 0.536612
-DEAL::1.00000 1.96262e-17 0.536612
+DEAL::Manifold id: 1
+DEAL::0.00000 8.32667e-17 0.646447
+DEAL::Manifold id: 1
+DEAL::1.00000 8.32667e-17 0.646447
+DEAL::Manifold id: 1
 DEAL::0.500000 0.500000 0.500000
+DEAL::Manifold id: 1
 DEAL::0.500000 -0.500000 0.500000
-DEAL::Center with manifold: 0.500000 5.55112e-17 0.536612
+DEAL::Manifold id: 1
+DEAL::Center with manifold: 0.500000 2.77556e-16 0.646447
+DEAL::Manifold id: 1
+DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
+DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
 DEAL::Distance between cell manifold and face manifold: 0.00000 0.00000 0.00000
-DEAL::Distance between cell manifold and face manifold: 0.00000 0.0220998 -0.101910
-DEAL::Distance between cell manifold and face manifold: 0.00000 -0.00774842 -0.289811
 DEAL::
diff --git a/tests/mappings/mapping.cc b/tests/mappings/mapping.cc
index fb2963b6d9..80f7c2e17c 100644
--- a/tests/mappings/mapping.cc
+++ b/tests/mappings/mapping.cc
@@ -25,6 +25,7 @@
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_out.h>
 #include <deal.II/grid/manifold_lib.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/fe/mapping_cartesian.h>
 #include <deal.II/fe/mapping_q1.h>
 #include <deal.II/fe/mapping_q.h>
@@ -304,8 +305,8 @@ void create_triangulations(std::vector<Triangulation<2> *> &tria_ptr,
       v3(1) = 3.;
       tria->set_manifold(1,*boundary1);
       tria->set_manifold(2,*boundary2);
-      tria->begin_active()->face(1)->set_boundary_id(1);
-      tria->begin_active()->face(3)->set_boundary_id(2);
+      tria->begin_active()->face(1)->set_manifold_id(1);
+      tria->begin_active()->face(3)->set_manifold_id(2);
       double pi=std::acos(-1.);
       double alpha=2*std::atan(0.5);
       exact_areas.push_back(4+pi-2.5*(alpha-std::sin(alpha)));
@@ -342,7 +343,7 @@ void create_triangulations(std::vector<Triangulation<2> *> &tria_ptr,
       v3(0) = 0.5;
       v3(1) = 1.5;
       tria->set_manifold(1,*boundary1);
-      tria->begin_active()->face(1)->set_boundary_id(1);
+      tria->begin_active()->face(1)->set_manifold_id(1);
       exact_areas.push_back(0.);
       for (unsigned int i=0; i<=4; ++i)
         show[4][i]=1;
@@ -397,7 +398,7 @@ void create_triangulations(std::vector<Triangulation<3> *> &tria_ptr,
       tria_ptr.push_back(tria);
       GridGenerator::hyper_cube(*tria, 1., 3.);
       tria->set_manifold(1,*boundary1);
-      tria->begin_active()->face(1)->set_boundary_id(1);
+      tria->begin_active()->face(1)->set_manifold_id(1);
       exact_areas.push_back(8.+pi/3*h*h*(3*r-h));
     }
 
diff --git a/tests/mappings/mapping_c1.cc b/tests/mappings/mapping_c1.cc
index 69f5dcaa5b..5b9712c34a 100644
--- a/tests/mappings/mapping_c1.cc
+++ b/tests/mappings/mapping_c1.cc
@@ -43,6 +43,7 @@ int main ()
   SphericalManifold<2> circle;
   Triangulation<2> tria;
   GridGenerator::hyper_cube(tria, -1, 1);
+  tria.set_all_manifold_ids_on_boundary(0);
   tria.set_manifold (0, circle);
 
 
diff --git a/tests/mappings/mapping_manifold_04.cc b/tests/mappings/mapping_manifold_04.cc
index fed66a09a6..ac0833849f 100644
--- a/tests/mappings/mapping_manifold_04.cc
+++ b/tests/mappings/mapping_manifold_04.cc
@@ -45,7 +45,7 @@ void test()
                outer_radius = 1.0;
   GridGenerator::hyper_shell (triangulation,
                               center, inner_radius, outer_radius);
-
+  triangulation.reset_manifold(0);
   const QGauss<spacedim> quad(3);
 
   FE_Q<dim,spacedim> fe(1);
diff --git a/tests/mappings/mapping_manifold_05.cc b/tests/mappings/mapping_manifold_05.cc
index ad9efbb871..44dd54f1c3 100644
--- a/tests/mappings/mapping_manifold_05.cc
+++ b/tests/mappings/mapping_manifold_05.cc
@@ -46,6 +46,7 @@ void test()
                outer_radius = 1.0;
   GridGenerator::hyper_shell (triangulation,
                               center, inner_radius, outer_radius);
+  triangulation.reset_manifold(0);
 
   const QGauss<spacedim-1> quad(3);
 
diff --git a/tests/mpi/map_dofs_to_support_points.cc b/tests/mpi/map_dofs_to_support_points.cc
index d83d7b9757..3fb8d5c9e2 100644
--- a/tests/mpi/map_dofs_to_support_points.cc
+++ b/tests/mpi/map_dofs_to_support_points.cc
@@ -33,6 +33,7 @@ void test()
   parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
 
   GridGenerator::hyper_ball(tr);
+  tr.reset_manifold(0);
   tr.refine_global (1);
 
   const FE_Q<dim> fe(1);
diff --git a/tests/mpi/no_flux_constraints.cc b/tests/mpi/no_flux_constraints.cc
index f98d61929d..5e5c588f1f 100644
--- a/tests/mpi/no_flux_constraints.cc
+++ b/tests/mpi/no_flux_constraints.cc
@@ -56,6 +56,7 @@ void test()
                               R0,
                               R1,
                               96, true);
+  triangulation.reset_manifold(0);
   triangulation.refine_global (2);
 
   for (typename Triangulation<dim>::active_cell_iterator
diff --git a/tests/mpi/no_flux_constraints_02.cc b/tests/mpi/no_flux_constraints_02.cc
index 1e205602a9..3a784526cc 100644
--- a/tests/mpi/no_flux_constraints_02.cc
+++ b/tests/mpi/no_flux_constraints_02.cc
@@ -57,6 +57,7 @@ void test()
                               R0,
                               R1,
                               96, true);
+  triangulation.reset_manifold(0);
   triangulation.refine_global (2);
 
   for (typename Triangulation<dim>::active_cell_iterator
diff --git a/tests/mpi/normal_flux_constraints.cc b/tests/mpi/normal_flux_constraints.cc
index f0c4020759..6632374426 100644
--- a/tests/mpi/normal_flux_constraints.cc
+++ b/tests/mpi/normal_flux_constraints.cc
@@ -55,6 +55,7 @@ void test()
                               R0,
                               R1,
                               96, true);
+  triangulation.reset_manifold(0);
   triangulation.refine_global (2);
 
   for (typename Triangulation<dim>::active_cell_iterator
diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.cc b/tests/mpi/p4est_2d_constraintmatrix_03.cc
index 697e929481..15fd58c6a8 100644
--- a/tests/mpi/p4est_2d_constraintmatrix_03.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc
@@ -29,6 +29,7 @@
 #include <deal.II/distributed/tria.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/dofs/dof_tools.h>
@@ -62,6 +63,7 @@ void test()
                               R1,
                               12,
                               true);
+  GridTools::copy_boundary_to_manifold_id(tr);
 
   static SphericalManifold<dim> boundary;
   tr.set_manifold (0, boundary);
diff --git a/tests/mpi/p4est_2d_constraintmatrix_04.cc b/tests/mpi/p4est_2d_constraintmatrix_04.cc
index c5f3838fdb..7db642ccf1 100644
--- a/tests/mpi/p4est_2d_constraintmatrix_04.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc
@@ -143,6 +143,7 @@ void test()
                               R1,
                               12,
                               true);
+  tr.reset_all_manifolds();
   static SphericalManifold<dim> boundary;
 //  tr.set_manifold (0, boundary);
 // tr.set_manifold (1, boundary);
diff --git a/tests/mpi/p4est_3d_constraintmatrix_03.cc b/tests/mpi/p4est_3d_constraintmatrix_03.cc
index ccb4c8a3f6..9db1cb99a9 100644
--- a/tests/mpi/p4est_3d_constraintmatrix_03.cc
+++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc
@@ -142,7 +142,9 @@ void test()
                               R1,
                               12,
                               true);
-  static SphericalManifold<dim> boundary;
+  tr.reset_manifold(0);
+
+//  static SphericalManifold<dim> boundary;
 //  tr.set_manifold (0, boundary);
 //tr.set_manifold (1, boundary);
 
diff --git a/tests/mpi/p4est_3d_refine_04.cc b/tests/mpi/p4est_3d_refine_04.cc
index 12d6f08251..a78d222a8a 100644
--- a/tests/mpi/p4est_3d_refine_04.cc
+++ b/tests/mpi/p4est_3d_refine_04.cc
@@ -56,6 +56,7 @@ void test()
                                   R1,
                                   (dim==3) ? 96 : 12,
                                   true);
+      triangulation.reset_manifold(0);
       triangulation.refine_global (2);
 
       // then flag all cells for
diff --git a/tests/mpi/periodicity_02.cc b/tests/mpi/periodicity_02.cc
index 5aa9308d70..1185f82ed0 100644
--- a/tests/mpi/periodicity_02.cc
+++ b/tests/mpi/periodicity_02.cc
@@ -719,6 +719,8 @@ namespace Step22
                                         outer_radius,
                                         0,
                                         true);
+    triangulation.set_all_manifold_ids(numbers::flat_manifold_id);
+    GridTools::copy_boundary_to_manifold_id(triangulation);
 
 #ifdef PERIODIC
     std::vector<GridTools::PeriodicFacePair<typename parallel::distributed::Triangulation<dim>::cell_iterator> >
diff --git a/tests/mpi/renumber_z_order_02.cc b/tests/mpi/renumber_z_order_02.cc
index e1e9b68594..b06ddeaca2 100644
--- a/tests/mpi/renumber_z_order_02.cc
+++ b/tests/mpi/renumber_z_order_02.cc
@@ -53,6 +53,7 @@ void test()
                               0.3,
                               1.0,
                               12, true);
+  tr.reset_all_manifolds();
 //  GridGenerator::hyper_cube (tr, -1.0, 1.0);
   tr.refine_global (1);
 
diff --git a/tests/numerics/create_laplace_matrix_01.cc b/tests/numerics/create_laplace_matrix_01.cc
index a154599250..f508f2d739 100644
--- a/tests/numerics/create_laplace_matrix_01.cc
+++ b/tests/numerics/create_laplace_matrix_01.cc
@@ -55,7 +55,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_laplace_matrix_01b.cc b/tests/numerics/create_laplace_matrix_01b.cc
index aa5916b99b..1dba5e5619 100644
--- a/tests/numerics/create_laplace_matrix_01b.cc
+++ b/tests/numerics/create_laplace_matrix_01b.cc
@@ -56,7 +56,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_laplace_matrix_02.cc b/tests/numerics/create_laplace_matrix_02.cc
index 41dce03a23..dc3d08d785 100644
--- a/tests/numerics/create_laplace_matrix_02.cc
+++ b/tests/numerics/create_laplace_matrix_02.cc
@@ -54,7 +54,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_laplace_matrix_02b.cc b/tests/numerics/create_laplace_matrix_02b.cc
index cc4209b075..7959609cb7 100644
--- a/tests/numerics/create_laplace_matrix_02b.cc
+++ b/tests/numerics/create_laplace_matrix_02b.cc
@@ -55,7 +55,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_laplace_matrix_03.cc b/tests/numerics/create_laplace_matrix_03.cc
index 4a20d1c118..7690740884 100644
--- a/tests/numerics/create_laplace_matrix_03.cc
+++ b/tests/numerics/create_laplace_matrix_03.cc
@@ -54,7 +54,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_laplace_matrix_03b.cc b/tests/numerics/create_laplace_matrix_03b.cc
index 383df4bd1b..6ad024fce5 100644
--- a/tests/numerics/create_laplace_matrix_03b.cc
+++ b/tests/numerics/create_laplace_matrix_03b.cc
@@ -55,7 +55,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_laplace_matrix_04.cc b/tests/numerics/create_laplace_matrix_04.cc
index 0eec67b237..ab390afd7d 100644
--- a/tests/numerics/create_laplace_matrix_04.cc
+++ b/tests/numerics/create_laplace_matrix_04.cc
@@ -53,7 +53,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_laplace_matrix_04b.cc b/tests/numerics/create_laplace_matrix_04b.cc
index 874b801876..d63c7231ef 100644
--- a/tests/numerics/create_laplace_matrix_04b.cc
+++ b/tests/numerics/create_laplace_matrix_04b.cc
@@ -54,7 +54,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_mass_matrix_01.cc b/tests/numerics/create_mass_matrix_01.cc
index 3ccdb1701e..35588c7850 100644
--- a/tests/numerics/create_mass_matrix_01.cc
+++ b/tests/numerics/create_mass_matrix_01.cc
@@ -55,7 +55,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_mass_matrix_01b.cc b/tests/numerics/create_mass_matrix_01b.cc
index d670686bdb..ee586539f9 100644
--- a/tests/numerics/create_mass_matrix_01b.cc
+++ b/tests/numerics/create_mass_matrix_01b.cc
@@ -56,7 +56,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_mass_matrix_02.cc b/tests/numerics/create_mass_matrix_02.cc
index b3f3229aa8..808c5f6aa2 100644
--- a/tests/numerics/create_mass_matrix_02.cc
+++ b/tests/numerics/create_mass_matrix_02.cc
@@ -54,7 +54,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_mass_matrix_02b.cc b/tests/numerics/create_mass_matrix_02b.cc
index afdf5cd675..9fec860c8e 100644
--- a/tests/numerics/create_mass_matrix_02b.cc
+++ b/tests/numerics/create_mass_matrix_02b.cc
@@ -55,7 +55,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_mass_matrix_03.cc b/tests/numerics/create_mass_matrix_03.cc
index 5e0e71a2ee..33ab57ed18 100644
--- a/tests/numerics/create_mass_matrix_03.cc
+++ b/tests/numerics/create_mass_matrix_03.cc
@@ -54,7 +54,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_mass_matrix_03b.cc b/tests/numerics/create_mass_matrix_03b.cc
index 08a2e0004c..7c43107185 100644
--- a/tests/numerics/create_mass_matrix_03b.cc
+++ b/tests/numerics/create_mass_matrix_03b.cc
@@ -55,7 +55,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_mass_matrix_04.cc b/tests/numerics/create_mass_matrix_04.cc
index 6bf851ae1c..e35d1db6b4 100644
--- a/tests/numerics/create_mass_matrix_04.cc
+++ b/tests/numerics/create_mass_matrix_04.cc
@@ -53,7 +53,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_mass_matrix_04b.cc b/tests/numerics/create_mass_matrix_04b.cc
index 65d8f09cd9..7289f4db3c 100644
--- a/tests/numerics/create_mass_matrix_04b.cc
+++ b/tests/numerics/create_mass_matrix_04b.cc
@@ -54,7 +54,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/create_mass_matrix_05.cc b/tests/numerics/create_mass_matrix_05.cc
index 0ca3235364..2f4660a586 100644
--- a/tests/numerics/create_mass_matrix_05.cc
+++ b/tests/numerics/create_mass_matrix_05.cc
@@ -46,7 +46,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/derivative_approximation_01.cc b/tests/numerics/derivative_approximation_01.cc
index 4f656d5513..8a8b76a479 100644
--- a/tests/numerics/derivative_approximation_01.cc
+++ b/tests/numerics/derivative_approximation_01.cc
@@ -42,7 +42,10 @@ check ()
 
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/derivatives.cc b/tests/numerics/derivatives.cc
index 51009385d8..833e05a745 100644
--- a/tests/numerics/derivatives.cc
+++ b/tests/numerics/derivatives.cc
@@ -54,7 +54,10 @@ check (const unsigned int level,
 
   DoFHandler<dim> dof(tr);
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
 
diff --git a/tests/numerics/error_estimator.cc b/tests/numerics/error_estimator.cc
index 02bb273266..915ffe09e8 100644
--- a/tests/numerics/error_estimator.cc
+++ b/tests/numerics/error_estimator.cc
@@ -74,7 +74,10 @@ check ()
 
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/no_flux_08.cc b/tests/numerics/no_flux_08.cc
index 8f4b134ea9..2c0357bf29 100644
--- a/tests/numerics/no_flux_08.cc
+++ b/tests/numerics/no_flux_08.cc
@@ -49,6 +49,7 @@ check ()
                                    Point<dim>(),
                                    0.5,
                                    1,0);
+  tr.reset_manifold(0);
 
   ConstraintMatrix cm;
   MappingQ<dim> mapping(1);
diff --git a/tests/numerics/no_flux_09.cc b/tests/numerics/no_flux_09.cc
index bea8c7e501..4e26587df8 100644
--- a/tests/numerics/no_flux_09.cc
+++ b/tests/numerics/no_flux_09.cc
@@ -47,6 +47,7 @@ check ()
                                       Point<dim>(),
                                       0.5, 1.0,
                                       3, true);
+  tr.reset_manifold(0);
 
   ConstraintMatrix cm;
   MappingQ<dim> mapping(1);
diff --git a/tests/numerics/no_flux_10.cc b/tests/numerics/no_flux_10.cc
index 49ba02516a..962dbd3498 100644
--- a/tests/numerics/no_flux_10.cc
+++ b/tests/numerics/no_flux_10.cc
@@ -35,6 +35,7 @@
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/grid_out.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/fe/fe_system.h>
 #include <deal.II/fe/mapping_q.h>
@@ -169,6 +170,7 @@ void run()
                          Point<dim>(),
                          0.5,
                          1.0);
+  GridTools::copy_boundary_to_manifold_id(triangulation);
 
   static SphericalManifold<dim> boundary((Point<dim>()));
   triangulation.set_manifold (0, boundary);
diff --git a/tests/numerics/no_flux_12.cc b/tests/numerics/no_flux_12.cc
index db43580e34..5648ec6e72 100644
--- a/tests/numerics/no_flux_12.cc
+++ b/tests/numerics/no_flux_12.cc
@@ -73,6 +73,7 @@ void run()
 
   // indicator 6 = cylinder
   GridGenerator::hyper_cube_with_cylindrical_hole (tria, 0.25, 0.5, 0.5, 1, true);
+  tria.reset_manifold(0);
 
   /*  std::string filename = "Mesh.eps";
   std::ofstream output (filename.c_str());
diff --git a/tests/numerics/no_flux_14.cc b/tests/numerics/no_flux_14.cc
index fe1690eddd..b0f34aa754 100644
--- a/tests/numerics/no_flux_14.cc
+++ b/tests/numerics/no_flux_14.cc
@@ -40,6 +40,7 @@ check ()
                                       Point<dim>(),
                                       0.5, 1.0,
                                       3, true);
+  tr.reset_manifold(0);
 
   ConstraintMatrix cm;
   MappingQ<dim> mapping(1);
diff --git a/tests/numerics/project_boundary_01.cc b/tests/numerics/project_boundary_01.cc
index a9fdb476b7..36ab6999d2 100644
--- a/tests/numerics/project_boundary_01.cc
+++ b/tests/numerics/project_boundary_01.cc
@@ -25,6 +25,7 @@
 #include <deal.II/base/quadrature_lib.h>
 #include <deal.II/lac/vector.h>
 #include <deal.II/grid/tria.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/manifold_lib.h>
 #include <deal.II/dofs/dof_accessor.h>
@@ -110,6 +111,8 @@ check ()
     }
   else
     GridGenerator::hyper_cube(tr, -1./std::sqrt(static_cast<double>(dim)),1./std::sqrt(static_cast<double>(dim)));
+  GridTools::copy_boundary_to_manifold_id(tr);
+
   static const SphericalManifold<dim> boundary;
   if (dim != 1)
     {
diff --git a/tests/numerics/project_common.h b/tests/numerics/project_common.h
index 4abde25cd5..592aa83137 100644
--- a/tests/numerics/project_common.h
+++ b/tests/numerics/project_common.h
@@ -204,6 +204,7 @@ void test_with_wrong_face_orientation (const FiniteElement<dim> &fe,
     {
       Triangulation<dim>     triangulation;
       GridGenerator::hyper_ball (triangulation);
+      triangulation.set_manifold(0);
       typename Triangulation<dim>::active_cell_iterator
       cell = triangulation.begin_active();
       std::advance (cell, i);
diff --git a/tests/numerics/project_parallel_common.h b/tests/numerics/project_parallel_common.h
index 39219ca9e4..561e17abfe 100644
--- a/tests/numerics/project_parallel_common.h
+++ b/tests/numerics/project_parallel_common.h
@@ -216,6 +216,7 @@ void test_with_wrong_face_orientation (const FiniteElement<dim> &fe,
     {
       parallel::distributed::Triangulation<dim> triangulation(MPI_COMM_WORLD);
       GridGenerator::hyper_ball (triangulation);
+      triangulation.reset_manifold(0);
       typename parallel::distributed::Triangulation<dim>::active_cell_iterator
       cell = triangulation.begin_active();
       std::advance (cell, i);
diff --git a/tests/numerics/vectors_boundary_rhs_01.cc b/tests/numerics/vectors_boundary_rhs_01.cc
index 45a7758c8a..8977b6824f 100644
--- a/tests/numerics/vectors_boundary_rhs_01.cc
+++ b/tests/numerics/vectors_boundary_rhs_01.cc
@@ -67,7 +67,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/vectors_boundary_rhs_02.cc b/tests/numerics/vectors_boundary_rhs_02.cc
index d559f3c035..f35b14608b 100644
--- a/tests/numerics/vectors_boundary_rhs_02.cc
+++ b/tests/numerics/vectors_boundary_rhs_02.cc
@@ -70,7 +70,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/vectors_boundary_rhs_03.cc b/tests/numerics/vectors_boundary_rhs_03.cc
index 6b6c53ae0b..97249bc9af 100644
--- a/tests/numerics/vectors_boundary_rhs_03.cc
+++ b/tests/numerics/vectors_boundary_rhs_03.cc
@@ -68,7 +68,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/vectors_point_source_01.cc b/tests/numerics/vectors_point_source_01.cc
index 032ea0eca2..e2692288d9 100644
--- a/tests/numerics/vectors_point_source_01.cc
+++ b/tests/numerics/vectors_point_source_01.cc
@@ -69,7 +69,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/vectors_rhs_01.cc b/tests/numerics/vectors_rhs_01.cc
index a1f023c7f5..fa6d996cd1 100644
--- a/tests/numerics/vectors_rhs_01.cc
+++ b/tests/numerics/vectors_rhs_01.cc
@@ -69,7 +69,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/numerics/vectors_rhs_03.cc b/tests/numerics/vectors_rhs_03.cc
index f359b2de8e..45ccadb25d 100644
--- a/tests/numerics/vectors_rhs_03.cc
+++ b/tests/numerics/vectors_rhs_03.cc
@@ -69,7 +69,10 @@ check ()
 {
   Triangulation<dim> tr;
   if (dim==2)
-    GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+    {
+      GridGenerator::hyper_ball(tr, Point<dim>(), 1);
+      tr.reset_manifold(0);
+    }
   else
     GridGenerator::hyper_cube(tr, -1,1);
   tr.refine_global (1);
diff --git a/tests/vector_tools/boundaries.cc b/tests/vector_tools/boundaries.cc
index 237dd13de6..ee837ff881 100644
--- a/tests/vector_tools/boundaries.cc
+++ b/tests/vector_tools/boundaries.cc
@@ -26,6 +26,7 @@
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/manifold_lib.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/dofs/dof_handler.h>
@@ -87,6 +88,7 @@ check ()
     }
   else
     GridGenerator::hyper_cube(tr, -1./std::sqrt(static_cast<double>(dim)),1./std::sqrt(static_cast<double>(dim)));
+  GridTools::copy_boundary_to_manifold_id(tr);
   static const SphericalManifold<dim> boundary;
   if (dim != 1)
     {
diff --git a/tests/vector_tools/boundaries_complex.cc b/tests/vector_tools/boundaries_complex.cc
index 037f83ea3f..e181aa07dd 100644
--- a/tests/vector_tools/boundaries_complex.cc
+++ b/tests/vector_tools/boundaries_complex.cc
@@ -28,6 +28,7 @@
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/manifold_lib.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/dofs/dof_handler.h>
@@ -90,6 +91,7 @@ check ()
     }
   else
     GridGenerator::hyper_cube(tr, -1./std::sqrt(static_cast<double>(dim)),1./std::sqrt(static_cast<double>(dim)));
+  GridTools::copy_boundary_to_manifold_id(tr);
   static const SphericalManifold<dim> boundary;
   if (dim != 1)
     {
diff --git a/tests/vector_tools/boundaries_complex_hp.cc b/tests/vector_tools/boundaries_complex_hp.cc
index d0c199113c..5491a37df4 100644
--- a/tests/vector_tools/boundaries_complex_hp.cc
+++ b/tests/vector_tools/boundaries_complex_hp.cc
@@ -26,6 +26,7 @@
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/manifold_lib.h>
+#include <deal.II/grid/grid_tools.h>
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/dofs/dof_handler.h>
@@ -88,6 +89,7 @@ check ()
     }
   else
     GridGenerator::hyper_cube(tr, -1./std::sqrt(static_cast<double>(dim)),1./std::sqrt(static_cast<double>(dim)));
+  GridTools::copy_boundary_to_manifold_id(tr);
   static const SphericalManifold<dim> boundary;
   if (dim != 1)
     {