From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Fri, 5 Jan 2018 16:02:51 +0000 (+0100)
Subject: Replace HyperShellBoundary by SphericalManifold in tests
X-Git-Tag: v9.0.0-rc1~595^2~2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3769e6250ff57ff3a8f5a43e92c48dc11908f86e;p=dealii.git

Replace HyperShellBoundary by SphericalManifold in tests
---

diff --git a/include/deal.II/grid/tria_boundary_lib.h b/include/deal.II/grid/tria_boundary_lib.h
index a10e5cfc76..3190728501 100644
--- a/include/deal.II/grid/tria_boundary_lib.h
+++ b/include/deal.II/grid/tria_boundary_lib.h
@@ -545,7 +545,7 @@ public:
  * @ingroup boundary
  *
  * @deprecated The boundary classes have been deprecated in favor of the more
- * general Manifold classes. For this class CylindricalManifold is an appropriate
+ * general Manifold classes. For this class SphericalManifold is an appropriate
  * replacement which is expected to produce better results under mesh refinement.
  *
  * @author Wolfgang Bangerth, 1999
diff --git a/tests/bits/step-2.cc b/tests/bits/step-2.cc
index 5c01499ef9..d3adaae51d 100644
--- a/tests/bits/step-2.cc
+++ b/tests/bits/step-2.cc
@@ -22,7 +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/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 
 #include <deal.II/hp/dof_handler.h>
 
@@ -45,8 +45,8 @@ void make_grid (Triangulation<2> &triangulation)
                               center, inner_radius, outer_radius,
                               10);
 
-  static const HyperShellBoundary<2> boundary_description(center);
-  triangulation.set_boundary (0, boundary_description);
+  static const SphericalManifold<2> boundary_description(center);
+  triangulation.set_manifold (0, boundary_description);
 
   for (unsigned int step=0; step<5; ++step)
     {
diff --git a/tests/grid/grid_hyper_shell.cc b/tests/grid/grid_hyper_shell.cc
index 4f1a7321ce..12ed42f022 100644
--- a/tests/grid/grid_hyper_shell.cc
+++ b/tests/grid/grid_hyper_shell.cc
@@ -19,7 +19,7 @@
 // refinement
 
 #include "../tests.h"
-#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria.h>
@@ -52,8 +52,8 @@ void check (double r1, double r2, unsigned int n)
           for (unsigned int e=0; e<GeometryInfo<dim>::lines_per_face; ++e)
             c->face(f)->line(e)->set_boundary_id(0);
 
-  static const HyperShellBoundary<dim> boundary(center);
-  tria.set_boundary(0, boundary);
+  static const SphericalManifold<dim> boundary(center);
+  tria.set_manifold(0, boundary);
 
   for (unsigned int i=0; i<2; ++i)
     {
diff --git a/tests/grid/grid_hyper_shell.output b/tests/grid/grid_hyper_shell.output
index 3c65a8844f..420ad0b8ec 100644
--- a/tests/grid/grid_hyper_shell.output
+++ b/tests/grid/grid_hyper_shell.output
@@ -43,22 +43,22 @@ object "vertices" class array type float rank 1 shape 2 items 200 data follows
 	3.64058 -2.64503
 	3.80423 1.23607
 	2.35114 3.23607
-	1.16736e-16 4.00000
+	8.88178e-16 4.00000
 	-2.35114 3.23607
 	-3.80423 1.23607
 	-3.80423 -1.23607
 	-2.35114 -3.23607
-	-7.00415e-16 -4.00000
+	-4.44089e-16 -4.00000
 	2.35114 -3.23607
 	3.80423 -1.23607
 	4.16338 1.35277
 	2.57311 3.54159
-	1.69390e-16 4.37764
+	5.55112e-16 4.37764
 	-2.57311 3.54159
 	-4.16338 1.35277
 	-4.16338 -1.35277
 	-2.57311 -3.54159
-	-7.38785e-16 -4.37764
+	-6.10623e-16 -4.37764
 	2.57311 -3.54159
 	4.16338 -1.35277
 	4.76127 0.734732
@@ -129,8 +129,8 @@ object "vertices" class array type float rank 1 shape 2 items 200 data follows
 	2.46213 3.38883
 	3.10684 3.09331
 	1.98184 3.91067
-	1.95717e-16 4.56646
-	1.43063e-16 4.18882
+	3.88578e-16 4.56646
+	7.21645e-16 4.18882
 	0.695288 4.32870
 	-0.695288 4.32870
 	-2.68410 3.69435
@@ -149,8 +149,8 @@ object "vertices" class array type float rank 1 shape 2 items 200 data follows
 	-2.46213 -3.38883
 	-3.10684 -3.09331
 	-1.98184 -3.91067
-	-7.57971e-16 -4.56646
-	-7.19600e-16 -4.18882
+	-6.93889e-16 -4.56646
+	-5.27356e-16 -4.18882
 	-0.695288 -4.32870
 	0.695288 -4.32870
 	2.68410 -3.69435
@@ -1272,10 +1272,10 @@ object "vertices" class array type float rank 1 shape 3 items 490 data follows
 	2.82843 0.00000 2.82843
 	0.00000 2.82843 2.82843
 	0.00000 0.00000 -3.59216
-	3.59216 0.00000 -4.44089e-16
-	0.00000 -4.44089e-16 3.59216
+	3.59216 0.00000 -2.22045e-16
+	0.00000 -2.22045e-16 3.59216
 	-3.59216 0.00000 0.00000
-	0.00000 -3.59216 -4.44089e-16
+	0.00000 -3.59216 -2.22045e-16
 	0.00000 3.59216 0.00000
 	-0.908716 -2.02166 -2.02166
 	0.908716 -2.02166 -2.02166
@@ -1445,10 +1445,10 @@ object "vertices" class array type float rank 1 shape 3 items 490 data follows
 	-1.41421 3.21029 0.00000
 	0.00000 -3.21029 1.41421
 	0.00000 -3.21029 -1.41421
-	1.41421 -3.21029 -2.22045e-16
-	-1.41421 -3.21029 -2.22045e-16
-	0.00000 -3.29608 -2.22045e-16
-	0.00000 -3.88824 -2.22045e-16
+	1.41421 -3.21029 -1.11022e-16
+	-1.41421 -3.21029 -1.11022e-16
+	0.00000 -3.29608 -1.11022e-16
+	0.00000 -3.88824 -1.11022e-16
 	-3.21029 0.00000 1.41421
 	-3.21029 0.00000 -1.41421
 	-3.29608 0.00000 0.00000
@@ -1457,46 +1457,46 @@ object "vertices" class array type float rank 1 shape 3 items 490 data follows
 	-3.21029 -1.41421 0.00000
 	0.00000 1.41421 3.21029
 	0.00000 -1.41421 3.21029
-	1.41421 -2.22045e-16 3.21029
-	-1.41421 -2.22045e-16 3.21029
-	0.00000 -2.22045e-16 3.29608
-	0.00000 -2.22045e-16 3.88824
+	1.41421 -1.11022e-16 3.21029
+	-1.41421 -1.11022e-16 3.21029
+	0.00000 -1.11022e-16 3.29608
+	0.00000 -1.11022e-16 3.88824
 	3.21029 0.00000 1.41421
 	3.21029 0.00000 -1.41421
-	3.21029 1.41421 -2.22045e-16
-	3.21029 -1.41421 -2.22045e-16
-	3.29608 0.00000 -2.22045e-16
-	3.88824 0.00000 -2.22045e-16
+	3.21029 1.41421 -1.11022e-16
+	3.21029 -1.41421 -1.11022e-16
+	3.29608 0.00000 -1.11022e-16
+	3.88824 0.00000 -1.11022e-16
 	0.00000 0.00000 -3.29608
 	0.00000 0.00000 -3.88824
 	1.41421 0.00000 -3.21029
 	-1.41421 0.00000 -3.21029
 	0.00000 1.41421 -3.21029
 	0.00000 -1.41421 -3.21029
-	-1.09719 -2.56755 -1.09719
-	-1.09719 -2.56755 1.09719
-	1.09719 -2.56755 -1.09719
-	1.09719 -2.56755 1.09719
-	-1.09719 -1.09719 -2.56755
-	1.09719 -1.09719 -2.56755
-	-1.09719 1.09719 -2.56755
-	1.09719 1.09719 -2.56755
-	-2.56755 -1.09719 -1.09719
-	-2.56755 1.09719 -1.09719
-	-2.56755 -1.09719 1.09719
-	-2.56755 1.09719 1.09719
-	2.56755 -1.09719 -1.09719
-	2.56755 -1.09719 1.09719
-	2.56755 1.09719 -1.09719
-	2.56755 1.09719 1.09719
-	-1.09719 2.56755 -1.09719
-	1.09719 2.56755 -1.09719
-	-1.09719 2.56755 1.09719
-	1.09719 2.56755 1.09719
-	-1.09719 -1.09719 2.56755
-	-1.09719 1.09719 2.56755
-	1.09719 -1.09719 2.56755
-	1.09719 1.09719 2.56755
+	-1.09051 -2.57324 -1.09051
+	-1.09051 -2.57324 1.09051
+	1.09051 -2.57324 -1.09051
+	1.09051 -2.57324 1.09051
+	-1.09051 -1.09051 -2.57324
+	1.09051 -1.09051 -2.57324
+	-1.09051 1.09051 -2.57324
+	1.09051 1.09051 -2.57324
+	-2.57324 -1.09051 -1.09051
+	-2.57324 1.09051 -1.09051
+	-2.57324 -1.09051 1.09051
+	-2.57324 1.09051 1.09051
+	2.57324 -1.09051 -1.09051
+	2.57324 -1.09051 1.09051
+	2.57324 1.09051 -1.09051
+	2.57324 1.09051 1.09051
+	-1.09051 2.57324 -1.09051
+	1.09051 2.57324 -1.09051
+	-1.09051 2.57324 1.09051
+	1.09051 2.57324 1.09051
+	-1.09051 -1.09051 2.57324
+	-1.09051 1.09051 2.57324
+	1.09051 -1.09051 2.57324
+	1.09051 1.09051 2.57324
 	-2.96918 -1.33461 -2.96918
 	-2.96918 1.33461 -2.96918
 	-2.29529 -1.03171 -2.29529
@@ -1581,10 +1581,10 @@ object "vertices" class array type float rank 1 shape 3 items 490 data follows
 	-1.28446 2.88960 1.28446
 	1.28446 2.88960 -1.28446
 	-1.28446 2.88960 -1.28446
-	1.28113 -2.99097 -1.11022e-16
-	-1.28113 -2.99097 -1.11022e-16
-	1.59099 -3.53511 -1.11022e-16
-	-1.59099 -3.53511 -1.11022e-16
+	1.28113 -2.99097 -5.55112e-17
+	-1.28113 -2.99097 -5.55112e-17
+	1.59099 -3.53511 -5.55112e-17
+	-1.59099 -3.53511 -5.55112e-17
 	1.28446 -2.88960 1.28446
 	1.28446 -2.88960 -1.28446
 	-1.28446 -2.88960 1.28446
@@ -1605,10 +1605,10 @@ object "vertices" class array type float rank 1 shape 3 items 490 data follows
 	-2.88960 -1.28446 1.28446
 	-2.88960 1.28446 -1.28446
 	-2.88960 -1.28446 -1.28446
-	1.28113 -1.11022e-16 2.99097
-	-1.28113 -1.11022e-16 2.99097
-	1.59099 -1.11022e-16 3.53511
-	-1.59099 -1.11022e-16 3.53511
+	1.28113 -5.55112e-17 2.99097
+	-1.28113 -5.55112e-17 2.99097
+	1.59099 -5.55112e-17 3.53511
+	-1.59099 -5.55112e-17 3.53511
 	1.28446 1.28446 2.88960
 	1.28446 -1.28446 2.88960
 	-1.28446 1.28446 2.88960
@@ -1617,10 +1617,10 @@ object "vertices" class array type float rank 1 shape 3 items 490 data follows
 	0.00000 1.59099 3.53511
 	0.00000 -1.28113 2.99097
 	0.00000 -1.59099 3.53511
-	2.99097 1.28113 -1.11022e-16
-	2.99097 -1.28113 -1.11022e-16
-	3.53511 1.59099 -1.11022e-16
-	3.53511 -1.59099 -1.11022e-16
+	2.99097 1.28113 -5.55112e-17
+	2.99097 -1.28113 -5.55112e-17
+	3.53511 1.59099 -5.55112e-17
+	3.53511 -1.59099 -5.55112e-17
 	2.88960 1.28446 1.28446
 	2.88960 1.28446 -1.28446
 	2.88960 -1.28446 1.28446
@@ -1645,50 +1645,50 @@ object "vertices" class array type float rank 1 shape 3 items 490 data follows
 	1.50238 -1.50238 -3.29172
 	-1.50238 1.50238 -3.29172
 	1.50238 1.50238 -3.29172
-	-1.19083 -1.19083 -2.72858
-	1.19083 -1.19083 -2.72858
-	-1.19083 1.19083 -2.72858
-	1.19083 1.19083 -2.72858
+	-1.18748 -1.18748 -2.73142
+	1.18748 -1.18748 -2.73142
+	-1.18748 1.18748 -2.73142
+	1.18748 1.18748 -2.73142
 	3.29172 -1.50238 -1.50238
 	3.29172 1.50238 -1.50238
-	2.72858 -1.19083 -1.19083
-	2.72858 1.19083 -1.19083
+	2.73142 -1.18748 -1.18748
+	2.73142 1.18748 -1.18748
 	3.29172 -1.50238 1.50238
 	3.29172 1.50238 1.50238
-	2.72858 -1.19083 1.19083
-	2.72858 1.19083 1.19083
+	2.73142 -1.18748 1.18748
+	2.73142 1.18748 1.18748
 	-1.50238 -1.50238 3.29172
 	1.50238 -1.50238 3.29172
-	-1.19083 -1.19083 2.72858
-	1.19083 -1.19083 2.72858
+	-1.18748 -1.18748 2.73142
+	1.18748 -1.18748 2.73142
 	-1.50238 1.50238 3.29172
 	1.50238 1.50238 3.29172
-	-1.19083 1.19083 2.72858
-	1.19083 1.19083 2.72858
+	-1.18748 1.18748 2.73142
+	1.18748 1.18748 2.73142
 	-3.29172 -1.50238 -1.50238
-	-2.72858 -1.19083 -1.19083
+	-2.73142 -1.18748 -1.18748
 	-3.29172 1.50238 -1.50238
-	-2.72858 1.19083 -1.19083
+	-2.73142 1.18748 -1.18748
 	-3.29172 -1.50238 1.50238
-	-2.72858 -1.19083 1.19083
+	-2.73142 -1.18748 1.18748
 	-3.29172 1.50238 1.50238
-	-2.72858 1.19083 1.19083
+	-2.73142 1.18748 1.18748
 	-1.50238 -3.29172 -1.50238
 	1.50238 -3.29172 -1.50238
-	-1.19083 -2.72858 -1.19083
-	1.19083 -2.72858 -1.19083
+	-1.18748 -2.73142 -1.18748
+	1.18748 -2.73142 -1.18748
 	-1.50238 -3.29172 1.50238
 	1.50238 -3.29172 1.50238
-	-1.19083 -2.72858 1.19083
-	1.19083 -2.72858 1.19083
+	-1.18748 -2.73142 1.18748
+	1.18748 -2.73142 1.18748
 	-1.50238 3.29172 -1.50238
-	-1.19083 2.72858 -1.19083
+	-1.18748 2.73142 -1.18748
 	1.50238 3.29172 -1.50238
-	1.19083 2.72858 -1.19083
+	1.18748 2.73142 -1.18748
 	-1.50238 3.29172 1.50238
-	-1.19083 2.72858 1.19083
+	-1.18748 2.73142 1.18748
 	1.50238 3.29172 1.50238
-	1.19083 2.72858 1.19083
+	1.18748 2.73142 1.18748
 object "cells" class array type int rank 1 shape 8 items 384 data follows
 	8	102	106	298	104	306	314	442
 	104	306	314	442	29	176	182	441
diff --git a/tests/grid/grid_hyper_shell_02.cc b/tests/grid/grid_hyper_shell_02.cc
index e6a7db8ee2..171b094f26 100644
--- a/tests/grid/grid_hyper_shell_02.cc
+++ b/tests/grid/grid_hyper_shell_02.cc
@@ -18,7 +18,7 @@
 // this series test the other possibilities for the number of cells
 
 #include "../tests.h"
-#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria.h>
@@ -37,8 +37,8 @@ void check (double r1, double r2, unsigned int n)
   Point<dim> center;
   Triangulation<dim> tria (Triangulation<dim>::none);
   GridGenerator::hyper_shell (tria, center, r1, r2, n);
-  static const HyperShellBoundary<dim> boundary(center);
-  tria.set_boundary(0, boundary);
+  static const SphericalManifold<dim> boundary(center);
+  tria.set_manifold(0, boundary);
   tria.refine_global(1);
 
   GridOut grid_out;
diff --git a/tests/grid/grid_hyper_shell_03.cc b/tests/grid/grid_hyper_shell_03.cc
index 2cf29359c2..7bab5ad42b 100644
--- a/tests/grid/grid_hyper_shell_03.cc
+++ b/tests/grid/grid_hyper_shell_03.cc
@@ -18,7 +18,7 @@
 // this series test the other possibilities for the number of cells
 
 #include "../tests.h"
-#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria.h>
@@ -37,8 +37,8 @@ void check (double r1, double r2, unsigned int n)
   Point<dim> center;
   Triangulation<dim> tria (Triangulation<dim>::none);
   GridGenerator::hyper_shell (tria, center, r1, r2, n);
-  static const HyperShellBoundary<dim> boundary(center);
-  tria.set_boundary(0, boundary);
+  static const SphericalManifold<dim> boundary(center);
+  tria.set_manifold(0, boundary);
   tria.refine_global(1);
 
   GridOut grid_out;
diff --git a/tests/grid/grid_hyper_shell_04.cc b/tests/grid/grid_hyper_shell_04.cc
index c78be462d1..cd73bad0a5 100644
--- a/tests/grid/grid_hyper_shell_04.cc
+++ b/tests/grid/grid_hyper_shell_04.cc
@@ -18,7 +18,7 @@
 // this series test the other possibilities for the number of cells
 
 #include "../tests.h"
-#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria.h>
@@ -37,8 +37,8 @@ void check (double r1, double r2, unsigned int n)
   Point<dim> center;
   Triangulation<dim> tria (Triangulation<dim>::none);
   GridGenerator::hyper_shell (tria, center, r1, r2, n);
-  static const HyperShellBoundary<dim> boundary(center);
-  tria.set_boundary(0, boundary);
+  static const SphericalManifold<dim> boundary(center);
+  tria.set_manifold(0, boundary);
 
   GridOut grid_out;
   grid_out.write_gnuplot (tria, logfile);
diff --git a/tests/grid/grid_hyper_shell_06.cc b/tests/grid/grid_hyper_shell_06.cc
index 047f12ff47..699035d91b 100644
--- a/tests/grid/grid_hyper_shell_06.cc
+++ b/tests/grid/grid_hyper_shell_06.cc
@@ -20,7 +20,7 @@
 // of the boundary
 
 #include "../tests.h"
-#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria.h>
@@ -39,8 +39,8 @@ void check (double r1, double r2, unsigned int n)
   Point<dim> center;
   Triangulation<dim> tria (Triangulation<dim>::none);
   GridGenerator::hyper_shell (tria, center, r1, r2, n, true);
-  static const HyperShellBoundary<dim> boundary(center);
-  tria.set_boundary(0, boundary);
+  static const SphericalManifold<dim> boundary(center);
+  tria.set_manifold(0, boundary);
 
   for (typename Triangulation<dim>::cell_iterator cell=tria.begin();
        cell != tria.end(); ++cell)
diff --git a/tests/grid/grid_transform.cc b/tests/grid/grid_transform.cc
index 909b4b8992..bb137e4a42 100644
--- a/tests/grid/grid_transform.cc
+++ b/tests/grid/grid_transform.cc
@@ -22,6 +22,7 @@
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/grid_out.h>
@@ -33,10 +34,10 @@ int main ()
 {
   const unsigned int dim=2;
   Point<dim> origin;
-  HyperShellBoundary<dim> boundary(origin);
+  SphericalManifold<dim> boundary(origin);
   MappingQ<dim> mapping(2);
   Triangulation<dim> tria;
-  tria.set_boundary(0, boundary);
+  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);
diff --git a/tests/grid/grid_transform_coefficient.cc b/tests/grid/grid_transform_coefficient.cc
index a5fd493b73..0b49e4d747 100644
--- a/tests/grid/grid_transform_coefficient.cc
+++ b/tests/grid/grid_transform_coefficient.cc
@@ -20,6 +20,7 @@
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/grid_out.h>
@@ -43,10 +44,10 @@ int main ()
 {
   const unsigned int dim=2;
   Point<dim> origin;
-  HyperShellBoundary<dim> boundary(origin);
+  SphericalManifold<dim> boundary(origin);
   MappingQ<dim> mapping(2);
   Triangulation<dim> tria;
-  tria.set_boundary(0, boundary);
+  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);
diff --git a/tests/grid/manifold_ids_on_boundary_01.cc b/tests/grid/manifold_ids_on_boundary_01.cc
index 1249e74cad..7e9947df2a 100644
--- a/tests/grid/manifold_ids_on_boundary_01.cc
+++ b/tests/grid/manifold_ids_on_boundary_01.cc
@@ -35,7 +35,7 @@ void dim_2(std::ostream &os)
   Triangulation<d> tr;
 
   GridGenerator::hyper_cube_with_cylindrical_hole(tr,inner,outer,outer,true);
-  static HyperShellBoundary<d> boundary;
+  static SphericalManifold<d> boundary;
   tr.set_all_manifold_ids_on_boundary(1,1);
   tr.set_manifold(1,boundary);
 
diff --git a/tests/hp/step-2.cc b/tests/hp/step-2.cc
index 199a70f1e8..1764cbbd57 100644
--- a/tests/hp/step-2.cc
+++ b/tests/hp/step-2.cc
@@ -22,7 +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/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 
 #include <deal.II/hp/dof_handler.h>
 
@@ -45,8 +45,8 @@ void make_grid (Triangulation<2> &triangulation)
                               center, inner_radius, outer_radius,
                               10);
 
-  static const HyperShellBoundary<2> boundary_description(center);
-  triangulation.set_boundary (0, boundary_description);
+  static const SphericalManifold<2> boundary_description(center);
+  triangulation.set_manifold (0, boundary_description);
 
   for (unsigned int step=0; step<5; ++step)
     {
diff --git a/tests/mpi/fe_field_function_02.cc b/tests/mpi/fe_field_function_02.cc
index 32d6ff2555..e2f37e8ce1 100644
--- a/tests/mpi/fe_field_function_02.cc
+++ b/tests/mpi/fe_field_function_02.cc
@@ -29,7 +29,6 @@
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/distributed/tria.h>
 #include <deal.II/grid/grid_generator.h>
-#include <deal.II/grid/tria_boundary_lib.h>
 #include <deal.II/grid/manifold_lib.h>
 
 #include <deal.II/grid/grid_out.h>
@@ -85,9 +84,9 @@ void test()
     for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
       if (cell->at_boundary(f))
         cell->face(f)->set_all_manifold_ids (numbers::invalid_manifold_id);
-  //  static const HyperShellBoundary<dim> boundary_shell;
-  //  tr.set_boundary (0, boundary_shell);
-  //  tr.set_boundary (1, boundary_shell);
+  //  static const SphericalManifold<dim> boundary_shell;
+  //  tr.set_manifold (0, boundary_shell);
+  //  tr.set_manifold (1, boundary_shell);
 
   tr.refine_global ((dim==2)?3:1);
 
diff --git a/tests/mpi/muelu_periodicity.cc b/tests/mpi/muelu_periodicity.cc
index 9732119c3f..bf8a084837 100644
--- a/tests/mpi/muelu_periodicity.cc
+++ b/tests/mpi/muelu_periodicity.cc
@@ -36,7 +36,7 @@
 #include <deal.II/lac/block_sparsity_pattern.h>
 
 #include <deal.II/grid/grid_generator.h>
-#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/grid_tools.h>
 
 #include <deal.II/dofs/dof_renumbering.h>
@@ -74,7 +74,7 @@ namespace Step22
 
     MPI_Comm                                    mpi_communicator;
 
-    HyperShellBoundary<dim>                     boundary;
+    SphericalManifold<dim>                      boundary;
     parallel::distributed::Triangulation<dim>   triangulation;
     FESystem<dim>                               fe;
     DoFHandler<dim>                             dof_handler;
@@ -731,8 +731,8 @@ namespace Step22
 #endif
 
 
-    triangulation.set_boundary(0, boundary);
-    triangulation.set_boundary(1, boundary);
+    triangulation.set_manifold(0, boundary);
+    triangulation.set_manifold(1, boundary);
 
     triangulation.refine_global (4-dim);
 
diff --git a/tests/mpi/p4est_2d_constraintmatrix_04.cc b/tests/mpi/p4est_2d_constraintmatrix_04.cc
index d3c33607d5..6b7a308627 100644
--- a/tests/mpi/p4est_2d_constraintmatrix_04.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc
@@ -36,7 +36,7 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/dofs/dof_accessor.h>
-#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/numerics/data_out.h>
 #include <deal.II/lac/trilinos_vector.h>
 
@@ -143,9 +143,9 @@ void test()
                               R1,
                               12,
                               true);
-  static HyperShellBoundary<dim> boundary;
-//  tr.set_boundary (0, boundary);
-// tr.set_boundary (1, boundary);
+  static SphericalManifold<dim> boundary;
+//  tr.set_manifold (0, boundary);
+// tr.set_manifold (1, boundary);
 
   tr.refine_global (3);
   if (1)
@@ -307,8 +307,8 @@ void test()
   std::ofstream output (filename.c_str());
   data_out.write_deal_II_intermediate (output);
 
-  tr.set_boundary (0);
-  tr.set_boundary (1);
+  tr.set_manifold (0);
+  tr.set_manifold (1);
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     deallog << "OK" << std::endl;
 }
diff --git a/tests/mpi/p4est_3d_constraintmatrix_03.cc b/tests/mpi/p4est_3d_constraintmatrix_03.cc
index ec62c77331..b0902ef721 100644
--- a/tests/mpi/p4est_3d_constraintmatrix_03.cc
+++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc
@@ -35,7 +35,7 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/dofs/dof_accessor.h>
-#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/numerics/data_out.h>
 #include <deal.II/lac/trilinos_parallel_block_vector.h>
 
@@ -142,9 +142,9 @@ void test()
                               R1,
                               12,
                               true);
-  static HyperShellBoundary<dim> boundary;
-//  tr.set_boundary (0, boundary);
-//tr.set_boundary (1, boundary);
+  static SphericalManifold<dim> boundary;
+//  tr.set_manifold (0, boundary);
+//tr.set_manifold (1, boundary);
 
   tr.refine_global (1);
   if (1)
@@ -302,8 +302,8 @@ void test()
   std::ofstream output (filename.c_str());
   data_out.write_vtu (output);
 
-  tr.set_boundary (0);
-  tr.set_boundary (1);
+  tr.set_manifold (0);
+  tr.set_manifold (1);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     deallog << "OK" << std::endl;
diff --git a/tests/mpi/periodicity_02.cc b/tests/mpi/periodicity_02.cc
index ef1a9722c0..c59dee9da1 100644
--- a/tests/mpi/periodicity_02.cc
+++ b/tests/mpi/periodicity_02.cc
@@ -38,7 +38,7 @@
 #include <deal.II/lac/block_sparsity_pattern.h>
 
 #include <deal.II/grid/grid_generator.h>
-#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/grid_tools.h>
 
 #include <deal.II/dofs/dof_renumbering.h>
@@ -76,7 +76,7 @@ namespace Step22
 
     MPI_Comm                                    mpi_communicator;
 
-    HyperShellBoundary<dim>                     boundary;
+    SphericalManifold<dim>                      boundary;
     parallel::distributed::Triangulation<dim>   triangulation;
     FESystem<dim>                               fe;
     DoFHandler<dim>                             dof_handler;
@@ -738,8 +738,8 @@ namespace Step22
 #endif
 
 
-    triangulation.set_boundary(0, boundary);
-    triangulation.set_boundary(1, boundary);
+    triangulation.set_manifold(0, boundary);
+    triangulation.set_manifold(1, boundary);
 
     triangulation.refine_global (4-dim);
 
diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc
index 7e9b5e468f..cd681c8a6f 100644
--- a/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc
+++ b/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc
@@ -25,7 +25,7 @@
 #include <deal.II/distributed/grid_refinement.h>
 #include <deal.II/grid/grid_refinement.h>
 #include <deal.II/grid/tria_accessor.h>
-#include <deal.II/grid/tria_boundary_lib.h>
+#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>
@@ -53,9 +53,9 @@ void test()
                               EquationData::R1,
                               12,
                               true);
-  static HyperShellBoundary<2> boundary;
-  tr.set_boundary (0, boundary);
-  tr.set_boundary (1, boundary);
+  static SphericalManifold<2> boundary;
+  tr.set_manifold (0, boundary);
+  tr.set_manifold (1, boundary);
 
   tr.refine_global (initial_refinement);
 
diff --git a/tests/numerics/no_flux_10.cc b/tests/numerics/no_flux_10.cc
index 2bbae89c05..98e9924ad0 100644
--- a/tests/numerics/no_flux_10.cc
+++ b/tests/numerics/no_flux_10.cc
@@ -33,7 +33,7 @@
 
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/grid_generator.h>
-#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/grid_out.h>
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/fe/fe_system.h>
@@ -170,8 +170,8 @@ void run()
                          0.5,
                          1.0);
 
-  static HyperShellBoundary<dim> boundary((Point<dim>()));
-  triangulation.set_boundary (0, boundary);
+  static SphericalManifold<dim> boundary((Point<dim>()));
+  triangulation.set_manifold (0, boundary);
 
   // write out the mesh. may not be
   // strictly necessary here, but is
diff --git a/tests/numerics/no_flux_10.output b/tests/numerics/no_flux_10.output
index ea74dc4f85..275317b0f2 100644
--- a/tests/numerics/no_flux_10.output
+++ b/tests/numerics/no_flux_10.output
@@ -1373,48 +1373,48 @@
 
 -0.2236 -0.2236 0.3873 0 0
 -0.2364 -0.1626 0.4095 0 0
--0.1723 -0.1732 0.4362 0 0
+-0.1729 -0.1729 0.4361 0 0
 -0.1626 -0.2364 0.4095 0 0
 -0.2236 -0.2236 0.3873 0 0
 
 
 -0.1626 -0.2364 0.4095 0 0
--0.1723 -0.1732 0.4362 0 0
--0.1047 -0.1804 0.4544 0 0
+-0.1729 -0.1729 0.4361 0 0
+-0.1054 -0.1799 0.4544 0 0
 -0.0987 -0.2451 0.4245 0 0
 -0.1626 -0.2364 0.4095 0 0
 
 
 -0.0987 -0.2451 0.4245 0 0
--0.1047 -0.1804 0.4544 0 0
--0.0351 -0.1841 0.4636 0 0
+-0.1054 -0.1799 0.4544 0 0
+-0.0354 -0.1835 0.4638 0 0
 -0.0331 -0.2495 0.4321 0 0
 -0.0987 -0.2451 0.4245 0 0
 
 
 -0.0331 -0.2495 0.4321 0 0
--0.0351 -0.1841 0.4636 0 0
-0.0351 -0.1841 0.4636 0 0
+-0.0354 -0.1835 0.4638 0 0
+0.0354 -0.1835 0.4638 0 0
 0.0331 -0.2495 0.4321 0 0
 -0.0331 -0.2495 0.4321 0 0
 
 
 0.0331 -0.2495 0.4321 0 0
-0.0351 -0.1841 0.4636 0 0
-0.1047 -0.1804 0.4544 0 0
+0.0354 -0.1835 0.4638 0 0
+0.1054 -0.1799 0.4544 0 0
 0.0987 -0.2451 0.4245 0 0
 0.0331 -0.2495 0.4321 0 0
 
 
 0.0987 -0.2451 0.4245 0 0
-0.1047 -0.1804 0.4544 0 0
-0.1723 -0.1732 0.4362 0 0
+0.1054 -0.1799 0.4544 0 0
+0.1729 -0.1729 0.4361 0 0
 0.1626 -0.2364 0.4095 0 0
 0.0987 -0.2451 0.4245 0 0
 
 
 0.1626 -0.2364 0.4095 0 0
-0.1723 -0.1732 0.4362 0 0
+0.1729 -0.1729 0.4361 0 0
 0.2364 -0.1626 0.4095 0 0
 0.2236 -0.2236 0.3873 0 0
 0.1626 -0.2364 0.4095 0 0
@@ -1422,296 +1422,296 @@
 
 -0.2364 -0.1626 0.4095 0 0
 -0.2451 -0.0987 0.4245 0 0
--0.1789 -0.1057 0.4548 0 0
--0.1723 -0.1732 0.4362 0 0
+-0.1799 -0.1054 0.4544 0 0
+-0.1729 -0.1729 0.4361 0 0
 -0.2364 -0.1626 0.4095 0 0
 
 
--0.1723 -0.1732 0.4362 0 0
--0.1789 -0.1057 0.4548 0 0
--0.1089 -0.1104 0.4753 0 0
--0.1047 -0.1804 0.4544 0 0
--0.1723 -0.1732 0.4362 0 0
+-0.1729 -0.1729 0.4361 0 0
+-0.1799 -0.1054 0.4544 0 0
+-0.1099 -0.1099 0.4752 0 0
+-0.1054 -0.1799 0.4544 0 0
+-0.1729 -0.1729 0.4361 0 0
 
 
--0.1047 -0.1804 0.4544 0 0
--0.1089 -0.1104 0.4753 0 0
--0.0366 -0.1128 0.4857 0 0
--0.0351 -0.1841 0.4636 0 0
--0.1047 -0.1804 0.4544 0 0
+-0.1054 -0.1799 0.4544 0 0
+-0.1099 -0.1099 0.4752 0 0
+-0.0370 -0.1122 0.4858 0 0
+-0.0354 -0.1835 0.4638 0 0
+-0.1054 -0.1799 0.4544 0 0
 
 
--0.0351 -0.1841 0.4636 0 0
--0.0366 -0.1128 0.4857 0 0
-0.0366 -0.1128 0.4857 0 0
-0.0351 -0.1841 0.4636 0 0
--0.0351 -0.1841 0.4636 0 0
+-0.0354 -0.1835 0.4638 0 0
+-0.0370 -0.1122 0.4858 0 0
+0.0370 -0.1122 0.4858 0 0
+0.0354 -0.1835 0.4638 0 0
+-0.0354 -0.1835 0.4638 0 0
 
 
-0.0351 -0.1841 0.4636 0 0
-0.0366 -0.1128 0.4857 0 0
-0.1089 -0.1104 0.4753 0 0
-0.1047 -0.1804 0.4544 0 0
-0.0351 -0.1841 0.4636 0 0
+0.0354 -0.1835 0.4638 0 0
+0.0370 -0.1122 0.4858 0 0
+0.1099 -0.1099 0.4752 0 0
+0.1054 -0.1799 0.4544 0 0
+0.0354 -0.1835 0.4638 0 0
 
 
-0.1047 -0.1804 0.4544 0 0
-0.1089 -0.1104 0.4753 0 0
-0.1789 -0.1057 0.4548 0 0
-0.1723 -0.1732 0.4362 0 0
-0.1047 -0.1804 0.4544 0 0
+0.1054 -0.1799 0.4544 0 0
+0.1099 -0.1099 0.4752 0 0
+0.1799 -0.1054 0.4544 0 0
+0.1729 -0.1729 0.4361 0 0
+0.1054 -0.1799 0.4544 0 0
 
 
-0.1723 -0.1732 0.4362 0 0
-0.1789 -0.1057 0.4548 0 0
+0.1729 -0.1729 0.4361 0 0
+0.1799 -0.1054 0.4544 0 0
 0.2451 -0.0987 0.4245 0 0
 0.2364 -0.1626 0.4095 0 0
-0.1723 -0.1732 0.4362 0 0
+0.1729 -0.1729 0.4361 0 0
 
 
 -0.2451 -0.0987 0.4245 0 0
 -0.2495 -0.0331 0.4321 0 0
--0.1823 -0.0355 0.4642 0 0
--0.1789 -0.1057 0.4548 0 0
+-0.1835 -0.0354 0.4638 0 0
+-0.1799 -0.1054 0.4544 0 0
 -0.2451 -0.0987 0.4245 0 0
 
 
--0.1789 -0.1057 0.4548 0 0
--0.1823 -0.0355 0.4642 0 0
--0.1110 -0.0372 0.4861 0 0
--0.1089 -0.1104 0.4753 0 0
--0.1789 -0.1057 0.4548 0 0
+-0.1799 -0.1054 0.4544 0 0
+-0.1835 -0.0354 0.4638 0 0
+-0.1122 -0.0370 0.4858 0 0
+-0.1099 -0.1099 0.4752 0 0
+-0.1799 -0.1054 0.4544 0 0
 
 
--0.1089 -0.1104 0.4753 0 0
--0.1110 -0.0372 0.4861 0 0
--0.0373 -0.0380 0.4972 0 0
--0.0366 -0.1128 0.4857 0 0
--0.1089 -0.1104 0.4753 0 0
+-0.1099 -0.1099 0.4752 0 0
+-0.1122 -0.0370 0.4858 0 0
+-0.0378 -0.0378 0.4971 0 0
+-0.0370 -0.1122 0.4858 0 0
+-0.1099 -0.1099 0.4752 0 0
 
 
--0.0366 -0.1128 0.4857 0 0
--0.0373 -0.0380 0.4972 0 0
-0.0373 -0.0380 0.4972 0 0
-0.0366 -0.1128 0.4857 0 0
--0.0366 -0.1128 0.4857 0 0
+-0.0370 -0.1122 0.4858 0 0
+-0.0378 -0.0378 0.4971 0 0
+0.0378 -0.0378 0.4971 0 0
+0.0370 -0.1122 0.4858 0 0
+-0.0370 -0.1122 0.4858 0 0
 
 
-0.0366 -0.1128 0.4857 0 0
-0.0373 -0.0380 0.4972 0 0
-0.1110 -0.0372 0.4861 0 0
-0.1089 -0.1104 0.4753 0 0
-0.0366 -0.1128 0.4857 0 0
+0.0370 -0.1122 0.4858 0 0
+0.0378 -0.0378 0.4971 0 0
+0.1122 -0.0370 0.4858 0 0
+0.1099 -0.1099 0.4752 0 0
+0.0370 -0.1122 0.4858 0 0
 
 
-0.1089 -0.1104 0.4753 0 0
-0.1110 -0.0372 0.4861 0 0
-0.1823 -0.0355 0.4642 0 0
-0.1789 -0.1057 0.4548 0 0
-0.1089 -0.1104 0.4753 0 0
+0.1099 -0.1099 0.4752 0 0
+0.1122 -0.0370 0.4858 0 0
+0.1835 -0.0354 0.4638 0 0
+0.1799 -0.1054 0.4544 0 0
+0.1099 -0.1099 0.4752 0 0
 
 
-0.1789 -0.1057 0.4548 0 0
-0.1823 -0.0355 0.4642 0 0
+0.1799 -0.1054 0.4544 0 0
+0.1835 -0.0354 0.4638 0 0
 0.2495 -0.0331 0.4321 0 0
 0.2451 -0.0987 0.4245 0 0
-0.1789 -0.1057 0.4548 0 0
+0.1799 -0.1054 0.4544 0 0
 
 
 -0.2495 -0.0331 0.4321 0 0
 -0.2495 0.0331 0.4321 0 0
--0.1823 0.0355 0.4642 0 0
--0.1823 -0.0355 0.4642 0 0
+-0.1835 0.0354 0.4638 0 0
+-0.1835 -0.0354 0.4638 0 0
 -0.2495 -0.0331 0.4321 0 0
 
 
--0.1823 -0.0355 0.4642 0 0
--0.1823 0.0355 0.4642 0 0
--0.1110 0.0372 0.4861 0 0
--0.1110 -0.0372 0.4861 0 0
--0.1823 -0.0355 0.4642 0 0
+-0.1835 -0.0354 0.4638 0 0
+-0.1835 0.0354 0.4638 0 0
+-0.1122 0.0370 0.4858 0 0
+-0.1122 -0.0370 0.4858 0 0
+-0.1835 -0.0354 0.4638 0 0
 
 
--0.1110 -0.0372 0.4861 0 0
--0.1110 0.0372 0.4861 0 0
--0.0373 0.0380 0.4972 0 0
--0.0373 -0.0380 0.4972 0 0
--0.1110 -0.0372 0.4861 0 0
+-0.1122 -0.0370 0.4858 0 0
+-0.1122 0.0370 0.4858 0 0
+-0.0378 0.0378 0.4971 0 0
+-0.0378 -0.0378 0.4971 0 0
+-0.1122 -0.0370 0.4858 0 0
 
 
--0.0373 -0.0380 0.4972 0 0
--0.0373 0.0380 0.4972 0 0
-0.0373 0.0380 0.4972 0 0
-0.0373 -0.0380 0.4972 0 0
--0.0373 -0.0380 0.4972 0 0
+-0.0378 -0.0378 0.4971 0 0
+-0.0378 0.0378 0.4971 0 0
+0.0378 0.0378 0.4971 0 0
+0.0378 -0.0378 0.4971 0 0
+-0.0378 -0.0378 0.4971 0 0
 
 
-0.0373 -0.0380 0.4972 0 0
-0.0373 0.0380 0.4972 0 0
-0.1110 0.0372 0.4861 0 0
-0.1110 -0.0372 0.4861 0 0
-0.0373 -0.0380 0.4972 0 0
+0.0378 -0.0378 0.4971 0 0
+0.0378 0.0378 0.4971 0 0
+0.1122 0.0370 0.4858 0 0
+0.1122 -0.0370 0.4858 0 0
+0.0378 -0.0378 0.4971 0 0
 
 
-0.1110 -0.0372 0.4861 0 0
-0.1110 0.0372 0.4861 0 0
-0.1823 0.0355 0.4642 0 0
-0.1823 -0.0355 0.4642 0 0
-0.1110 -0.0372 0.4861 0 0
+0.1122 -0.0370 0.4858 0 0
+0.1122 0.0370 0.4858 0 0
+0.1835 0.0354 0.4638 0 0
+0.1835 -0.0354 0.4638 0 0
+0.1122 -0.0370 0.4858 0 0
 
 
-0.1823 -0.0355 0.4642 0 0
-0.1823 0.0355 0.4642 0 0
+0.1835 -0.0354 0.4638 0 0
+0.1835 0.0354 0.4638 0 0
 0.2495 0.0331 0.4321 0 0
 0.2495 -0.0331 0.4321 0 0
-0.1823 -0.0355 0.4642 0 0
+0.1835 -0.0354 0.4638 0 0
 
 
 -0.2495 0.0331 0.4321 0 0
 -0.2451 0.0987 0.4245 0 0
--0.1789 0.1057 0.4548 0 0
--0.1823 0.0355 0.4642 0 0
+-0.1799 0.1054 0.4544 0 0
+-0.1835 0.0354 0.4638 0 0
 -0.2495 0.0331 0.4321 0 0
 
 
--0.1823 0.0355 0.4642 0 0
--0.1789 0.1057 0.4548 0 0
--0.1089 0.1104 0.4753 0 0
--0.1110 0.0372 0.4861 0 0
--0.1823 0.0355 0.4642 0 0
+-0.1835 0.0354 0.4638 0 0
+-0.1799 0.1054 0.4544 0 0
+-0.1099 0.1099 0.4752 0 0
+-0.1122 0.0370 0.4858 0 0
+-0.1835 0.0354 0.4638 0 0
 
 
--0.1110 0.0372 0.4861 0 0
--0.1089 0.1104 0.4753 0 0
--0.0366 0.1128 0.4857 0 0
--0.0373 0.0380 0.4972 0 0
--0.1110 0.0372 0.4861 0 0
+-0.1122 0.0370 0.4858 0 0
+-0.1099 0.1099 0.4752 0 0
+-0.0370 0.1122 0.4858 0 0
+-0.0378 0.0378 0.4971 0 0
+-0.1122 0.0370 0.4858 0 0
 
 
--0.0373 0.0380 0.4972 0 0
--0.0366 0.1128 0.4857 0 0
-0.0366 0.1128 0.4857 0 0
-0.0373 0.0380 0.4972 0 0
--0.0373 0.0380 0.4972 0 0
+-0.0378 0.0378 0.4971 0 0
+-0.0370 0.1122 0.4858 0 0
+0.0370 0.1122 0.4858 0 0
+0.0378 0.0378 0.4971 0 0
+-0.0378 0.0378 0.4971 0 0
 
 
-0.0373 0.0380 0.4972 0 0
-0.0366 0.1128 0.4857 0 0
-0.1089 0.1104 0.4753 0 0
-0.1110 0.0372 0.4861 0 0
-0.0373 0.0380 0.4972 0 0
+0.0378 0.0378 0.4971 0 0
+0.0370 0.1122 0.4858 0 0
+0.1099 0.1099 0.4752 0 0
+0.1122 0.0370 0.4858 0 0
+0.0378 0.0378 0.4971 0 0
 
 
-0.1110 0.0372 0.4861 0 0
-0.1089 0.1104 0.4753 0 0
-0.1789 0.1057 0.4548 0 0
-0.1823 0.0355 0.4642 0 0
-0.1110 0.0372 0.4861 0 0
+0.1122 0.0370 0.4858 0 0
+0.1099 0.1099 0.4752 0 0
+0.1799 0.1054 0.4544 0 0
+0.1835 0.0354 0.4638 0 0
+0.1122 0.0370 0.4858 0 0
 
 
-0.1823 0.0355 0.4642 0 0
-0.1789 0.1057 0.4548 0 0
+0.1835 0.0354 0.4638 0 0
+0.1799 0.1054 0.4544 0 0
 0.2451 0.0987 0.4245 0 0
 0.2495 0.0331 0.4321 0 0
-0.1823 0.0355 0.4642 0 0
+0.1835 0.0354 0.4638 0 0
 
 
 -0.2451 0.0987 0.4245 0 0
 -0.2364 0.1626 0.4095 0 0
--0.1723 0.1732 0.4362 0 0
--0.1789 0.1057 0.4548 0 0
+-0.1729 0.1729 0.4361 0 0
+-0.1799 0.1054 0.4544 0 0
 -0.2451 0.0987 0.4245 0 0
 
 
--0.1789 0.1057 0.4548 0 0
--0.1723 0.1732 0.4362 0 0
--0.1047 0.1804 0.4544 0 0
--0.1089 0.1104 0.4753 0 0
--0.1789 0.1057 0.4548 0 0
+-0.1799 0.1054 0.4544 0 0
+-0.1729 0.1729 0.4361 0 0
+-0.1054 0.1799 0.4544 0 0
+-0.1099 0.1099 0.4752 0 0
+-0.1799 0.1054 0.4544 0 0
 
 
--0.1089 0.1104 0.4753 0 0
--0.1047 0.1804 0.4544 0 0
--0.0351 0.1841 0.4636 0 0
--0.0366 0.1128 0.4857 0 0
--0.1089 0.1104 0.4753 0 0
+-0.1099 0.1099 0.4752 0 0
+-0.1054 0.1799 0.4544 0 0
+-0.0354 0.1835 0.4638 0 0
+-0.0370 0.1122 0.4858 0 0
+-0.1099 0.1099 0.4752 0 0
 
 
--0.0366 0.1128 0.4857 0 0
--0.0351 0.1841 0.4636 0 0
-0.0351 0.1841 0.4636 0 0
-0.0366 0.1128 0.4857 0 0
--0.0366 0.1128 0.4857 0 0
+-0.0370 0.1122 0.4858 0 0
+-0.0354 0.1835 0.4638 0 0
+0.0354 0.1835 0.4638 0 0
+0.0370 0.1122 0.4858 0 0
+-0.0370 0.1122 0.4858 0 0
 
 
-0.0366 0.1128 0.4857 0 0
-0.0351 0.1841 0.4636 0 0
-0.1047 0.1804 0.4544 0 0
-0.1089 0.1104 0.4753 0 0
-0.0366 0.1128 0.4857 0 0
+0.0370 0.1122 0.4858 0 0
+0.0354 0.1835 0.4638 0 0
+0.1054 0.1799 0.4544 0 0
+0.1099 0.1099 0.4752 0 0
+0.0370 0.1122 0.4858 0 0
 
 
-0.1089 0.1104 0.4753 0 0
-0.1047 0.1804 0.4544 0 0
-0.1723 0.1732 0.4362 0 0
-0.1789 0.1057 0.4548 0 0
-0.1089 0.1104 0.4753 0 0
+0.1099 0.1099 0.4752 0 0
+0.1054 0.1799 0.4544 0 0
+0.1729 0.1729 0.4361 0 0
+0.1799 0.1054 0.4544 0 0
+0.1099 0.1099 0.4752 0 0
 
 
-0.1789 0.1057 0.4548 0 0
-0.1723 0.1732 0.4362 0 0
+0.1799 0.1054 0.4544 0 0
+0.1729 0.1729 0.4361 0 0
 0.2364 0.1626 0.4095 0 0
 0.2451 0.0987 0.4245 0 0
-0.1789 0.1057 0.4548 0 0
+0.1799 0.1054 0.4544 0 0
 
 
 -0.2364 0.1626 0.4095 0 0
 -0.2236 0.2236 0.3873 0 0
 -0.1626 0.2364 0.4095 0 0
--0.1723 0.1732 0.4362 0 0
+-0.1729 0.1729 0.4361 0 0
 -0.2364 0.1626 0.4095 0 0
 
 
--0.1723 0.1732 0.4362 0 0
+-0.1729 0.1729 0.4361 0 0
 -0.1626 0.2364 0.4095 0 0
 -0.0987 0.2451 0.4245 0 0
--0.1047 0.1804 0.4544 0 0
--0.1723 0.1732 0.4362 0 0
+-0.1054 0.1799 0.4544 0 0
+-0.1729 0.1729 0.4361 0 0
 
 
--0.1047 0.1804 0.4544 0 0
+-0.1054 0.1799 0.4544 0 0
 -0.0987 0.2451 0.4245 0 0
 -0.0331 0.2495 0.4321 0 0
--0.0351 0.1841 0.4636 0 0
--0.1047 0.1804 0.4544 0 0
+-0.0354 0.1835 0.4638 0 0
+-0.1054 0.1799 0.4544 0 0
 
 
--0.0351 0.1841 0.4636 0 0
+-0.0354 0.1835 0.4638 0 0
 -0.0331 0.2495 0.4321 0 0
 0.0331 0.2495 0.4321 0 0
-0.0351 0.1841 0.4636 0 0
--0.0351 0.1841 0.4636 0 0
+0.0354 0.1835 0.4638 0 0
+-0.0354 0.1835 0.4638 0 0
 
 
-0.0351 0.1841 0.4636 0 0
+0.0354 0.1835 0.4638 0 0
 0.0331 0.2495 0.4321 0 0
 0.0987 0.2451 0.4245 0 0
-0.1047 0.1804 0.4544 0 0
-0.0351 0.1841 0.4636 0 0
+0.1054 0.1799 0.4544 0 0
+0.0354 0.1835 0.4638 0 0
 
 
-0.1047 0.1804 0.4544 0 0
+0.1054 0.1799 0.4544 0 0
 0.0987 0.2451 0.4245 0 0
 0.1626 0.2364 0.4095 0 0
-0.1723 0.1732 0.4362 0 0
-0.1047 0.1804 0.4544 0 0
+0.1729 0.1729 0.4361 0 0
+0.1054 0.1799 0.4544 0 0
 
 
-0.1723 0.1732 0.4362 0 0
+0.1729 0.1729 0.4361 0 0
 0.1626 0.2364 0.4095 0 0
 0.2236 0.2236 0.3873 0 0
 0.2364 0.1626 0.4095 0 0
-0.1723 0.1732 0.4362 0 0
+0.1729 0.1729 0.4361 0 0
 
 
 -0.4472 -0.4472 0.7746 0 0
diff --git a/tests/trilinos/trilinos_sparsity_pattern_02.cc b/tests/trilinos/trilinos_sparsity_pattern_02.cc
index 59c6263e96..ddf2e72a23 100644
--- a/tests/trilinos/trilinos_sparsity_pattern_02.cc
+++ b/tests/trilinos/trilinos_sparsity_pattern_02.cc
@@ -23,7 +23,7 @@
 #include <deal.II/lac/constraint_matrix.h>
 #include <deal.II/lac/block_sparsity_pattern.h>
 #include <deal.II/grid/grid_generator.h>
-#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
 #include <deal.II/distributed/tria.h>
 #include <deal.II/dofs/dof_renumbering.h>
 #include <deal.II/dofs/dof_tools.h>
@@ -48,7 +48,7 @@ namespace Step22
 
     MPI_Comm                                    mpi_communicator;
 
-    HyperShellBoundary<dim>                     boundary;
+    SphericalManifold<dim>                      boundary;
     parallel::distributed::Triangulation<dim>   triangulation;
     FESystem<dim>                               fe;
     DoFHandler<dim>                             dof_handler;
@@ -135,8 +135,8 @@ namespace Step22
                                         0,
                                         true);
 
-    triangulation.set_boundary(0, boundary);
-    triangulation.set_boundary(1, boundary);
+    triangulation.set_manifold(0, boundary);
+    triangulation.set_manifold(1, boundary);
     setup_dofs ();