From: heltai Date: Thu, 14 Nov 2013 16:15:54 +0000 (+0000) Subject: Replaced and regexped most tests from Boundary to Manifold. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58b3fbf79065dfed71bc426e39dd2b9ece381d6e;p=dealii-svn.git Replaced and regexped most tests from Boundary to Manifold. git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@31654 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/bits/cone_01.cc b/tests/bits/cone_01.cc index b3f8ecf095..ce008405b7 100644 --- a/tests/bits/cone_01.cc +++ b/tests/bits/cone_01.cc @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -45,7 +45,7 @@ void check () p1[0] = -1; p2[0] = 1; static const ConeBoundary boundary (1, 0.5, p1, p2); - triangulation.set_boundary (0, boundary); + triangulation.set_manifold (0, boundary); triangulation.refine_global (2); diff --git a/tests/bits/cylinder_01.cc b/tests/bits/cylinder_01.cc index 0a758c26b5..553a8d3bc1 100644 --- a/tests/bits/cylinder_01.cc +++ b/tests/bits/cylinder_01.cc @@ -16,14 +16,14 @@ -// check the cells generated by the CylinderBoundary the default +// check the cells generated by the CylinderManifold the default // axiparallel cylinder #include "../tests.h" #include #include #include -#include +#include #include #include #include @@ -41,8 +41,8 @@ void check () { Triangulation triangulation; GridGenerator::cylinder (triangulation); - static const CylinderBoundary boundary (1,0); - triangulation.set_boundary (0, boundary); + static const CylinderManifold boundary (0); + triangulation.set_manifold (0, boundary); triangulation.refine_global (2); for (typename Triangulation::active_cell_iterator diff --git a/tests/bits/cylinder_02.cc b/tests/bits/cylinder_02.cc index 00ad1f9c19..6430842c34 100644 --- a/tests/bits/cylinder_02.cc +++ b/tests/bits/cylinder_02.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -54,8 +54,8 @@ void check () GridTools::transform ((Point ( *)(const Point &))&rotate_to_y, triangulation); - static const CylinderBoundary boundary (1,1); - triangulation.set_boundary (0, boundary); + static const CylinderManifold boundary (1); + triangulation.set_manifold (0, boundary); triangulation.refine_global (2); for (typename Triangulation::active_cell_iterator diff --git a/tests/bits/cylinder_03.cc b/tests/bits/cylinder_03.cc index b61ad237c3..b7c93e5323 100644 --- a/tests/bits/cylinder_03.cc +++ b/tests/bits/cylinder_03.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -51,8 +51,8 @@ void check () GridTools::transform ((Point ( *)(const Point &))&rotate_to_y, triangulation); - static const CylinderBoundary boundary (1,2); - triangulation.set_boundary (0, boundary); + static const CylinderManifold boundary (2); + triangulation.set_manifold (0, boundary); triangulation.refine_global (2); for (typename Triangulation::active_cell_iterator diff --git a/tests/bits/cylinder_04.cc b/tests/bits/cylinder_04.cc index ea6ffa2f34..34572de73f 100644 --- a/tests/bits/cylinder_04.cc +++ b/tests/bits/cylinder_04.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -55,10 +55,9 @@ void check () GridTools::transform ((Point ( *)(const Point &))&rotate_to_y, triangulation); - static const CylinderBoundary boundary (1, - Point(std::cos(xy_angle), std::sin(xy_angle), 0), + static const CylinderManifold boundary (Point(std::cos(xy_angle), std::sin(xy_angle), 0), Point()); - triangulation.set_boundary (0, boundary); + triangulation.set_manifold (0, boundary); triangulation.refine_global (2); for (typename Triangulation::active_cell_iterator diff --git a/tests/bits/distorted_cells_03.cc b/tests/bits/distorted_cells_03.cc index 0e16552ed8..5f1eca12c3 100644 --- a/tests/bits/distorted_cells_03.cc +++ b/tests/bits/distorted_cells_03.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -86,8 +86,8 @@ void check () // set bottom face to use MyBoundary for (unsigned int f=0; f::faces_per_cell; ++f) if (coarse_grid.begin_active()->face(f)->center()[dim-1] == -1) - coarse_grid.begin_active()->face(f)->set_boundary_indicator (1); - coarse_grid.set_boundary (1, my_boundary); + coarse_grid.begin_active()->face(f)->set_manifold_indicator (1); + coarse_grid.set_manifold (1, my_boundary); // now try to refine this one // cell. we should get an exception diff --git a/tests/bits/distorted_cells_04.cc b/tests/bits/distorted_cells_04.cc index 715cbd5759..b6c693af6a 100644 --- a/tests/bits/distorted_cells_04.cc +++ b/tests/bits/distorted_cells_04.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -119,8 +119,8 @@ void check () // set bottom face to use MyBoundary for (unsigned int f=0; f::faces_per_cell; ++f) if (coarse_grid.begin_active()->face(f)->center()[dim-1] == -1) - coarse_grid.begin_active()->face(f)->set_boundary_indicator (1); - coarse_grid.set_boundary (1, my_boundary); + coarse_grid.begin_active()->face(f)->set_manifold_indicator (1); + coarse_grid.set_manifold (1, my_boundary); // now try to refine this one // cell. we should get an exception diff --git a/tests/bits/distorted_cells_05.cc b/tests/bits/distorted_cells_05.cc index 7fe258c245..a719d8713b 100644 --- a/tests/bits/distorted_cells_05.cc +++ b/tests/bits/distorted_cells_05.cc @@ -121,8 +121,8 @@ void check () // set bottom face to use MyBoundary for (unsigned int f=0; f::faces_per_cell; ++f) if (coarse_grid.begin_active()->face(f)->center()[dim-1] == -1) - coarse_grid.begin_active()->face(f)->set_boundary_indicator (1); - coarse_grid.set_boundary (1, my_boundary); + coarse_grid.begin_active()->face(f)->set_manifold_indicator (1); + coarse_grid.set_manifold (1, my_boundary); // now try to refine this one // cell. we should get an exception diff --git a/tests/bits/distorted_cells_06.cc b/tests/bits/distorted_cells_06.cc index 7e8bae09bf..8c433a0e49 100644 --- a/tests/bits/distorted_cells_06.cc +++ b/tests/bits/distorted_cells_06.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -79,8 +79,8 @@ void check () if (coarse_grid.begin_active()->face(f)->line(e)->center()[0] == 0) if (coarse_grid.begin_active()->face(f)->line(e)->center()[1] == 0.5) if (coarse_grid.begin_active()->face(f)->line(e)->center()[2] == 0) - coarse_grid.begin_active()->face(f)->line(e)->set_boundary_indicator (99); - coarse_grid.set_boundary (99, my_boundary); + coarse_grid.begin_active()->face(f)->line(e)->set_manifold_indicator (99); + coarse_grid.set_manifold (99, my_boundary); // now try to refine this one // cell. we should get an exception diff --git a/tests/bits/distorted_mapped_cells_02.cc b/tests/bits/distorted_mapped_cells_02.cc index 14c0128241..dafdce0272 100644 --- a/tests/bits/distorted_mapped_cells_02.cc +++ b/tests/bits/distorted_mapped_cells_02.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include void test() @@ -35,8 +35,8 @@ void test() // shell is so narrow that MappingQ(2) distorts the cell GridGenerator::quarter_hyper_shell (tria, Point(), 0.95, 1, 1); - static HyperShellBoundary boundary; - tria.set_boundary (0, boundary); + static PolarManifold boundary; + tria.set_manifold (0, boundary); FE_Nothing dummy; MappingQ mapping(2); diff --git a/tests/bits/fe_field_function_04.cc b/tests/bits/fe_field_function_04.cc index cfbe9d6906..4db00c3473 100644 --- a/tests/bits/fe_field_function_04.cc +++ b/tests/bits/fe_field_function_04.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -48,11 +48,11 @@ public: template void test() { - const HyperBallBoundary boundary_description; + const PolarManifold boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_boundary (0, boundary_description); + triangulation.set_manifold (0, boundary_description); triangulation.refine_global (1); FE_Q fe(2); diff --git a/tests/bits/fe_field_function_04_vector.cc b/tests/bits/fe_field_function_04_vector.cc index 1d5876637b..321151aa24 100644 --- a/tests/bits/fe_field_function_04_vector.cc +++ b/tests/bits/fe_field_function_04_vector.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -51,11 +51,11 @@ public: template void test() { - const HyperBallBoundary boundary_description; + const PolarManifold boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_boundary (0, boundary_description); + triangulation.set_manifold (0, boundary_description); triangulation.refine_global (1); FESystem fe(FE_Q (2),2); diff --git a/tests/bits/fe_field_function_05.cc b/tests/bits/fe_field_function_05.cc index 080b703436..230d70d612 100644 --- a/tests/bits/fe_field_function_05.cc +++ b/tests/bits/fe_field_function_05.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -52,11 +52,11 @@ public: template void test() { - const HyperBallBoundary boundary_description; + const PolarManifold boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_boundary (0, boundary_description); + triangulation.set_manifold (0, boundary_description); triangulation.refine_global (1); FE_Q fe(2); diff --git a/tests/bits/fe_field_function_05_vector.cc b/tests/bits/fe_field_function_05_vector.cc index 3bbc04d690..e81bcc21a5 100644 --- a/tests/bits/fe_field_function_05_vector.cc +++ b/tests/bits/fe_field_function_05_vector.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -56,11 +56,11 @@ public: template void test() { - const HyperBallBoundary boundary_description; + const PolarManifold boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_boundary (0, boundary_description); + triangulation.set_manifold (0, boundary_description); triangulation.refine_global (1); FESystem fe(FE_Q (2),2); diff --git a/tests/bits/fe_field_function_06_vector.cc b/tests/bits/fe_field_function_06_vector.cc index dba992f305..5adcc3bcdf 100644 --- a/tests/bits/fe_field_function_06_vector.cc +++ b/tests/bits/fe_field_function_06_vector.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -56,11 +56,11 @@ public: template void test() { - const HyperBallBoundary boundary_description; + const PolarManifold boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_boundary (0, boundary_description); + triangulation.set_manifold (0, boundary_description); triangulation.refine_global (1); FESystem fe(FE_Q (2),2); diff --git a/tests/bits/fe_field_function_07_vector.cc b/tests/bits/fe_field_function_07_vector.cc index 1b77cd426a..fce7cb69cd 100644 --- a/tests/bits/fe_field_function_07_vector.cc +++ b/tests/bits/fe_field_function_07_vector.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -65,11 +65,11 @@ public: template void test() { - const HyperBallBoundary boundary_description; + const PolarManifold boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_boundary (0, boundary_description); + triangulation.set_manifold (0, boundary_description); triangulation.refine_global (1); FESystem fe(FE_Q (2),2); diff --git a/tests/bits/fe_field_function_08_vector.cc b/tests/bits/fe_field_function_08_vector.cc index 39d88e7be3..c29a84c8c4 100644 --- a/tests/bits/fe_field_function_08_vector.cc +++ b/tests/bits/fe_field_function_08_vector.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -65,11 +65,11 @@ public: template void test() { - const HyperBallBoundary boundary_description; + const PolarManifold boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_boundary (0, boundary_description); + triangulation.set_manifold (0, boundary_description); triangulation.refine_global (1); FESystem fe(FE_Q (4),2); diff --git a/tests/bits/joa_1.cc b/tests/bits/joa_1.cc index 2348eff411..60dfd89fdd 100644 --- a/tests/bits/joa_1.cc +++ b/tests/bits/joa_1.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -1044,8 +1044,8 @@ void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); triangulation.refine_global (1); } diff --git a/tests/bits/step-10-high-order.cc b/tests/bits/step-10-high-order.cc index c88304ad58..ff422ac458 100644 --- a/tests/bits/step-10-high-order.cc +++ b/tests/bits/step-10-high-order.cc @@ -32,7 +32,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -62,8 +62,8 @@ void compute_pi_by_area () Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); MappingQ mapping(degree); const FE_Q dummy_fe (1); @@ -134,8 +134,8 @@ void compute_pi_by_perimeter () Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); const MappingQ mapping (degree); const FE_Q fe (1); diff --git a/tests/bits/step-10.cc b/tests/bits/step-10.cc index d46fbf3034..09a0b5dbce 100644 --- a/tests/bits/step-10.cc +++ b/tests/bits/step-10.cc @@ -30,7 +30,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -56,8 +56,8 @@ void gnuplot_output() Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); for (unsigned int refinement=0; refinement<2; ++refinement, triangulation.refine_global(1)) @@ -99,8 +99,8 @@ void compute_pi_by_area () Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); MappingQ mapping(degree); @@ -165,8 +165,8 @@ void compute_pi_by_perimeter () Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); const MappingQ mapping (degree); const FE_Q fe (1); diff --git a/tests/bits/step-11.cc b/tests/bits/step-11.cc index 28d97a1eab..a88b70875c 100644 --- a/tests/bits/step-11.cc +++ b/tests/bits/step-11.cc @@ -35,7 +35,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -197,8 +197,8 @@ template void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); for (unsigned int cycle=0; cycle<6; ++cycle, triangulation.refine_global(1)) { diff --git a/tests/bits/step-5.cc b/tests/bits/step-5.cc index 2a825122fd..e183d669c0 100644 --- a/tests/bits/step-5.cc +++ b/tests/bits/step-5.cc @@ -48,7 +48,7 @@ std::ofstream logfile("output"); #include -#include +#include #include #include @@ -306,8 +306,8 @@ void LaplaceProblem::run () grid_in.read_ucd (input_file); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); } deallog << " Number of active cells: " diff --git a/tests/bits/step-6.cc b/tests/bits/step-6.cc index 8fa10830c4..d61122cc32 100644 --- a/tests/bits/step-6.cc +++ b/tests/bits/step-6.cc @@ -39,7 +39,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -338,8 +338,8 @@ void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); triangulation.refine_global (1); } diff --git a/tests/codim_one/boundary_indicator_01.cc b/tests/codim_one/boundary_indicator_01.cc index 5f9d260a38..762f75f524 100644 --- a/tests/codim_one/boundary_indicator_01.cc +++ b/tests/codim_one/boundary_indicator_01.cc @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include @@ -59,10 +59,10 @@ int main () const int dim = 3; deallog << "Testing hyper_cube in dim: " << dim << "..."<< endl; - const HyperBallBoundary boundary_description; + const PolarManifold boundary_description; Triangulation volume_mesh; GridGenerator::hyper_ball(volume_mesh); - volume_mesh.set_boundary (0, boundary_description); + volume_mesh.set_manifold (0, boundary_description); // exclude one of the 6 faces // from the surface mesh @@ -75,7 +75,7 @@ int main () for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->at_boundary(f)) { - cell->face(f)->set_boundary_indicator(1); + cell->face(f)->set_manifold_indicator(1); done = true; break; } @@ -85,7 +85,7 @@ int main () const HyperBallBoundary surface_description; Triangulation boundary_mesh; - boundary_mesh.set_boundary (0, surface_description); + boundary_mesh.set_manifold (0, surface_description); // now extract a mesh of the 5 // surface faces @@ -108,7 +108,7 @@ int main () cell != boundary_mesh.end(); ++cell) for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->at_boundary(f)) - cell->face(f)->set_boundary_indicator(1); + cell->face(f)->set_manifold_indicator(1); boundary_mesh.refine_global (2); diff --git a/tests/codim_one/extract_boundary_mesh_02.cc b/tests/codim_one/extract_boundary_mesh_02.cc index 573a45066d..66d32023d7 100644 --- a/tests/codim_one/extract_boundary_mesh_02.cc +++ b/tests/codim_one/extract_boundary_mesh_02.cc @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include @@ -96,15 +96,15 @@ int main () map< Triangulation::cell_iterator, Triangulation::face_iterator> surface_to_volume_mapping; - const HyperBallBoundary boundary_description; + const PolarManifold boundary_description; Triangulation volume_mesh; GridGenerator::hyper_ball(volume_mesh); - volume_mesh.set_boundary (0, boundary_description); + volume_mesh.set_manifold (0, boundary_description); volume_mesh.refine_global (1); const HyperBallBoundary surface_description; Triangulation boundary_mesh; - boundary_mesh.set_boundary (0, surface_description); + boundary_mesh.set_manifold (0, surface_description); surface_to_volume_mapping = GridTools::extract_boundary_mesh (volume_mesh, boundary_mesh); diff --git a/tests/codim_one/extract_boundary_mesh_03.cc b/tests/codim_one/extract_boundary_mesh_03.cc index b820cb4391..db3ac04245 100644 --- a/tests/codim_one/extract_boundary_mesh_03.cc +++ b/tests/codim_one/extract_boundary_mesh_03.cc @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include @@ -104,7 +104,7 @@ int main () map< Triangulation::cell_iterator, Triangulation::face_iterator> surface_to_volume_mapping; - const HyperBallBoundary boundary_description; + const PolarManifold boundary_description; Triangulation volume_mesh; GridGenerator::hyper_ball(volume_mesh); for (Triangulation::active_cell_iterator @@ -113,12 +113,12 @@ int main () for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->at_boundary(f)) cell->face(f)->set_all_boundary_indicators (1); - volume_mesh.set_boundary (1, boundary_description); + volume_mesh.set_manifold (1, boundary_description); volume_mesh.refine_global (1); const HyperBallBoundary surface_description; Triangulation boundary_mesh; - boundary_mesh.set_boundary (1, surface_description); + boundary_mesh.set_manifold (1, surface_description); surface_to_volume_mapping = GridTools::extract_boundary_mesh (volume_mesh, boundary_mesh); diff --git a/tests/codim_one/extract_boundary_mesh_04.cc b/tests/codim_one/extract_boundary_mesh_04.cc index 942651a808..39e02bccda 100644 --- a/tests/codim_one/extract_boundary_mesh_04.cc +++ b/tests/codim_one/extract_boundary_mesh_04.cc @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include @@ -104,7 +104,7 @@ int main () map< Triangulation::cell_iterator, Triangulation::face_iterator> surface_to_volume_mapping; - const HyperBallBoundary boundary_description; + const PolarManifold boundary_description; Triangulation volume_mesh; GridGenerator::hyper_ball(volume_mesh); for (Triangulation::active_cell_iterator @@ -114,14 +114,14 @@ int main () if (cell->at_boundary(f) && (cell->center()[dim-1]>0)) cell->face(f)->set_all_boundary_indicators (1); - volume_mesh.set_boundary (1, boundary_description); - volume_mesh.set_boundary (0, boundary_description); + volume_mesh.set_manifold (1, boundary_description); + volume_mesh.set_manifold (0, boundary_description); volume_mesh.refine_global (1); const HyperBallBoundary surface_description; Triangulation boundary_mesh; - boundary_mesh.set_boundary (1, surface_description); - boundary_mesh.set_boundary (0, surface_description); + boundary_mesh.set_manifold (1, surface_description); + boundary_mesh.set_manifold (0, surface_description); set boundary_ids; boundary_ids.insert(1); diff --git a/tests/codim_one/grid_refinement.cc b/tests/codim_one/grid_refinement.cc index 9815e30965..f74f631e62 100644 --- a/tests/codim_one/grid_refinement.cc +++ b/tests/codim_one/grid_refinement.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -39,7 +39,7 @@ void test(std::string filename) { HyperBallBoundary boundary; Triangulation tria; - tria.set_boundary(1, boundary); + tria.set_manifold(1, boundary); GridIn gi; gi.attach_triangulation (tria); std::ifstream in (filename.c_str()); diff --git a/tests/codim_one/mapping_01.cc b/tests/codim_one/mapping_01.cc index fd527e3d1b..b26fa257b6 100644 --- a/tests/codim_one/mapping_01.cc +++ b/tests/codim_one/mapping_01.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -44,9 +44,9 @@ void test () Triangulation volume_mesh; GridGenerator::hyper_ball(volume_mesh); - const HyperBallBoundary surface_description; + const PolarManifold surface_description; Triangulation boundary_mesh; - boundary_mesh.set_boundary (0, surface_description); + boundary_mesh.set_manifold (0, surface_description); GridTools::extract_boundary_mesh (volume_mesh, boundary_mesh); diff --git a/tests/codim_one/mapping_02.cc b/tests/codim_one/mapping_02.cc index 0849d7b8af..cbe2afdf20 100644 --- a/tests/codim_one/mapping_02.cc +++ b/tests/codim_one/mapping_02.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -43,7 +43,7 @@ void test () const HyperBallBoundary surface_description; Triangulation boundary_mesh; - boundary_mesh.set_boundary (0, surface_description); + boundary_mesh.set_manifold (0, surface_description); GridTools::extract_boundary_mesh (volume_mesh, boundary_mesh); diff --git a/tests/codim_one/torus_01.cc b/tests/codim_one/torus_01.cc index af63da020b..1c4b86e762 100644 --- a/tests/codim_one/torus_01.cc +++ b/tests/codim_one/torus_01.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -45,7 +45,7 @@ int main () TorusBoundary boundary (1.5, .5); Triangulation tria; - tria.set_boundary (0, boundary); + tria.set_manifold (0, boundary); GridGenerator::torus (tria, 1.5, .5); tria.refine_global(2); diff --git a/tests/deal.II/boundaries.cc b/tests/deal.II/boundaries.cc index 60372d4f29..a9188fa4fc 100644 --- a/tests/deal.II/boundaries.cc +++ b/tests/deal.II/boundaries.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -99,10 +99,10 @@ check () } else GridGenerator::hyper_cube(tr, -1./std::sqrt(static_cast(dim)),1./std::sqrt(static_cast(dim))); - static const HyperBallBoundary boundary; + static const PolarManifold boundary; if (dim != 1) { - tr.set_boundary (0, boundary); + tr.set_manifold (0, boundary); } tr.refine_global (1); tr.begin_active()->set_refine_flag (); diff --git a/tests/deal.II/dof_test.cc b/tests/deal.II/dof_test.cc index bf41611661..6b3c8d2a69 100644 --- a/tests/deal.II/dof_test.cc +++ b/tests/deal.II/dof_test.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -46,13 +46,13 @@ std::ofstream logfile("output"); template class Ball : - public StraightBoundary + public FlatManifold { public: virtual Point get_new_point_on_line (const typename Triangulation::line_iterator &line) const { - Point middle = StraightBoundary::get_new_point_on_line(line); + Point middle = FlatManifold::get_new_point_on_line(line); for (int i=0; i get_new_point_on_quad (const typename Triangulation::quad_iterator &quad) const { - Point middle = StraightBoundary::get_new_point_on_quad(quad); + Point middle = FlatManifold::get_new_point_on_quad(quad); for (int i=0; i class CurvedLine : - public StraightBoundary + public FlatManifold { public: virtual Point @@ -98,7 +98,7 @@ template Point CurvedLine::get_new_point_on_line (const typename Triangulation::line_iterator &line) const { - Point middle = StraightBoundary::get_new_point_on_line (line); + Point middle = FlatManifold::get_new_point_on_line (line); // if the line is at the top of bottom // face: do a special treatment on @@ -147,7 +147,7 @@ template Point CurvedLine::get_new_point_on_quad (const typename Triangulation::quad_iterator &quad) const { - Point middle = StraightBoundary::get_new_point_on_quad (quad); + Point middle = FlatManifold::get_new_point_on_quad (quad); // if the face is at the top of bottom // face: do not move the midpoint in @@ -266,12 +266,12 @@ void TestCases::run (const unsigned int test_case) { if (dim==3) { - tria->begin_active()->face(4)->set_boundary_indicator(1); - tria->begin_active()->face(5)->set_boundary_indicator(1); + tria->begin_active()->face(4)->set_manifold_indicator(1); + tria->begin_active()->face(5)->set_manifold_indicator(1); }; // set the boundary function - tria->set_boundary(1, (test_case==2) + tria->set_manifold(1, (test_case==2) ? ((Boundary &)ball) : ((Boundary &)curved_line)); // refine once diff --git a/tests/deal.II/fe_values_view_01.cc b/tests/deal.II/fe_values_view_01.cc index e0f3e1d58a..b669f007bd 100644 --- a/tests/deal.II/fe_values_view_01.cc +++ b/tests/deal.II/fe_values_view_01.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -95,8 +95,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_02.cc b/tests/deal.II/fe_values_view_02.cc index 32c32e9a23..d1eaf98248 100644 --- a/tests/deal.II/fe_values_view_02.cc +++ b/tests/deal.II/fe_values_view_02.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -120,8 +120,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_03.cc b/tests/deal.II/fe_values_view_03.cc index f0e57a117c..8d1d98949b 100644 --- a/tests/deal.II/fe_values_view_03.cc +++ b/tests/deal.II/fe_values_view_03.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -101,8 +101,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_04.cc b/tests/deal.II/fe_values_view_04.cc index 74eee71807..66634f246f 100644 --- a/tests/deal.II/fe_values_view_04.cc +++ b/tests/deal.II/fe_values_view_04.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -121,8 +121,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_05.cc b/tests/deal.II/fe_values_view_05.cc index 97fc058ebd..3280b8e23b 100644 --- a/tests/deal.II/fe_values_view_05.cc +++ b/tests/deal.II/fe_values_view_05.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -87,8 +87,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_06.cc b/tests/deal.II/fe_values_view_06.cc index a4fb1c78ce..6c2e7ebacf 100644 --- a/tests/deal.II/fe_values_view_06.cc +++ b/tests/deal.II/fe_values_view_06.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -88,8 +88,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_07.cc b/tests/deal.II/fe_values_view_07.cc index d0ce6a04ef..c2f2ef5019 100644 --- a/tests/deal.II/fe_values_view_07.cc +++ b/tests/deal.II/fe_values_view_07.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -88,8 +88,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_08.cc b/tests/deal.II/fe_values_view_08.cc index 9215f4c530..75c9e11a4c 100644 --- a/tests/deal.II/fe_values_view_08.cc +++ b/tests/deal.II/fe_values_view_08.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -89,8 +89,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_09.cc b/tests/deal.II/fe_values_view_09.cc index 2f2cff48c0..32598a8761 100644 --- a/tests/deal.II/fe_values_view_09.cc +++ b/tests/deal.II/fe_values_view_09.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -92,8 +92,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_10.cc b/tests/deal.II/fe_values_view_10.cc index b1436f6df9..357f764086 100644 --- a/tests/deal.II/fe_values_view_10.cc +++ b/tests/deal.II/fe_values_view_10.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -93,8 +93,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_10_single_01.cc b/tests/deal.II/fe_values_view_10_single_01.cc index 4ac711fffa..ffd8f40071 100644 --- a/tests/deal.II/fe_values_view_10_single_01.cc +++ b/tests/deal.II/fe_values_view_10_single_01.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -97,8 +97,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FE_RaviartThomas fe(1); test(tr, fe); diff --git a/tests/deal.II/fe_values_view_10_single_02.cc b/tests/deal.II/fe_values_view_10_single_02.cc index 20ecbbe073..253cda5821 100644 --- a/tests/deal.II/fe_values_view_10_single_02.cc +++ b/tests/deal.II/fe_values_view_10_single_02.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -97,8 +97,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FE_Nedelec fe(1); test(tr, fe); diff --git a/tests/deal.II/fe_values_view_10_single_03.cc b/tests/deal.II/fe_values_view_10_single_03.cc index 0d0cb82d17..4806ae1e99 100644 --- a/tests/deal.II/fe_values_view_10_single_03.cc +++ b/tests/deal.II/fe_values_view_10_single_03.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -97,8 +97,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe(FE_RaviartThomas(1),1); test(tr, fe); diff --git a/tests/deal.II/fe_values_view_10_single_04.cc b/tests/deal.II/fe_values_view_10_single_04.cc index 923ab6b65a..c26ee8e24c 100644 --- a/tests/deal.II/fe_values_view_10_single_04.cc +++ b/tests/deal.II/fe_values_view_10_single_04.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -95,8 +95,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_11.cc b/tests/deal.II/fe_values_view_11.cc index 42328f17e8..eaa03e4eac 100644 --- a/tests/deal.II/fe_values_view_11.cc +++ b/tests/deal.II/fe_values_view_11.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -93,8 +93,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_12.cc b/tests/deal.II/fe_values_view_12.cc index 3a26c309e5..42fc0cc381 100644 --- a/tests/deal.II/fe_values_view_12.cc +++ b/tests/deal.II/fe_values_view_12.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -94,8 +94,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_13.cc b/tests/deal.II/fe_values_view_13.cc index e357f01904..f0ce11914c 100644 --- a/tests/deal.II/fe_values_view_13.cc +++ b/tests/deal.II/fe_values_view_13.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -94,8 +94,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_14.cc b/tests/deal.II/fe_values_view_14.cc index 8346626253..d543530d1f 100644 --- a/tests/deal.II/fe_values_view_14.cc +++ b/tests/deal.II/fe_values_view_14.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -97,8 +97,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_15.cc b/tests/deal.II/fe_values_view_15.cc index 7104b9ef35..4aa6b44bee 100644 --- a/tests/deal.II/fe_values_view_15.cc +++ b/tests/deal.II/fe_values_view_15.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -98,8 +98,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_16.cc b/tests/deal.II/fe_values_view_16.cc index e906d800df..099e49abfd 100644 --- a/tests/deal.II/fe_values_view_16.cc +++ b/tests/deal.II/fe_values_view_16.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -99,8 +99,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_17.cc b/tests/deal.II/fe_values_view_17.cc index 498fa3dae7..beb2352df7 100644 --- a/tests/deal.II/fe_values_view_17.cc +++ b/tests/deal.II/fe_values_view_17.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -98,8 +98,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_18.cc b/tests/deal.II/fe_values_view_18.cc index 59dec4c5d3..0fcc9bf268 100644 --- a/tests/deal.II/fe_values_view_18.cc +++ b/tests/deal.II/fe_values_view_18.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -103,8 +103,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_19.cc b/tests/deal.II/fe_values_view_19.cc index 25e40dac85..a22f30773c 100644 --- a/tests/deal.II/fe_values_view_19.cc +++ b/tests/deal.II/fe_values_view_19.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -98,8 +98,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_Q(2), 2, diff --git a/tests/deal.II/fe_values_view_20.cc b/tests/deal.II/fe_values_view_20.cc index 06efab4146..8a954b58a8 100644 --- a/tests/deal.II/fe_values_view_20.cc +++ b/tests/deal.II/fe_values_view_20.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -102,8 +102,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), 1, FE_RaviartThomas(1), 1, diff --git a/tests/deal.II/fe_values_view_23.cc b/tests/deal.II/fe_values_view_23.cc index 3f99ca5ceb..071d9cd11f 100644 --- a/tests/deal.II/fe_values_view_23.cc +++ b/tests/deal.II/fe_values_view_23.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -91,8 +91,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), SymmetricTensor<2,dim>::n_independent_components); diff --git a/tests/deal.II/fe_values_view_23_nonsymmetric.cc b/tests/deal.II/fe_values_view_23_nonsymmetric.cc index 2e17287429..775dec95b6 100644 --- a/tests/deal.II/fe_values_view_23_nonsymmetric.cc +++ b/tests/deal.II/fe_values_view_23_nonsymmetric.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -91,8 +91,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), Tensor<2,dim>::n_independent_components); diff --git a/tests/deal.II/fe_values_view_24.cc b/tests/deal.II/fe_values_view_24.cc index dbf9c01df3..1a8e9c45b4 100644 --- a/tests/deal.II/fe_values_view_24.cc +++ b/tests/deal.II/fe_values_view_24.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -85,8 +85,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), SymmetricTensor<2,dim>::n_independent_components); diff --git a/tests/deal.II/fe_values_view_24_nonsymmetric.cc b/tests/deal.II/fe_values_view_24_nonsymmetric.cc index fc0f020cb3..c37d411f5f 100644 --- a/tests/deal.II/fe_values_view_24_nonsymmetric.cc +++ b/tests/deal.II/fe_values_view_24_nonsymmetric.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -85,8 +85,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); FESystem fe (FE_Q(1), Tensor<2,dim>::n_independent_components); diff --git a/tests/deal.II/grid_hyper_shell.cc b/tests/deal.II/grid_hyper_shell.cc index 0b196be527..5d8054282c 100644 --- a/tests/deal.II/grid_hyper_shell.cc +++ b/tests/deal.II/grid_hyper_shell.cc @@ -20,7 +20,7 @@ // refinement #include "../tests.h" -#include +#include #include #include #include @@ -46,8 +46,8 @@ void check (double r1, double r2, unsigned int n) Point center; Triangulation tria (Triangulation::none, true); GridGenerator::hyper_shell (tria, center, r1, r2, n, true); - static const HyperShellBoundary boundary(center); - tria.set_boundary(0, boundary); + static const PolarManifold boundary(center); + tria.set_manifold(0, boundary); for (unsigned int i=0; i<2; ++i) { diff --git a/tests/deal.II/grid_hyper_shell_02.cc b/tests/deal.II/grid_hyper_shell_02.cc index 9ae80cc543..322b3452c1 100644 --- a/tests/deal.II/grid_hyper_shell_02.cc +++ b/tests/deal.II/grid_hyper_shell_02.cc @@ -19,7 +19,7 @@ // this series test the other possibilities for the number of cells #include "../tests.h" -#include +#include #include #include #include @@ -43,8 +43,8 @@ void check (double r1, double r2, unsigned int n) Point center; Triangulation tria (Triangulation::none); GridGenerator::hyper_shell (tria, center, r1, r2, n); - static const HyperShellBoundary boundary(center); - tria.set_boundary(0, boundary); + static const PolarManifold boundary(center); + tria.set_manifold(0, boundary); tria.refine_global(1); GridOut grid_out; diff --git a/tests/deal.II/grid_hyper_shell_03.cc b/tests/deal.II/grid_hyper_shell_03.cc index ae1ac3d012..27561c9449 100644 --- a/tests/deal.II/grid_hyper_shell_03.cc +++ b/tests/deal.II/grid_hyper_shell_03.cc @@ -19,7 +19,7 @@ // this series test the other possibilities for the number of cells #include "../tests.h" -#include +#include #include #include #include @@ -43,8 +43,8 @@ void check (double r1, double r2, unsigned int n) Point center; Triangulation tria (Triangulation::none); GridGenerator::hyper_shell (tria, center, r1, r2, n); - static const HyperShellBoundary boundary(center); - tria.set_boundary(0, boundary); + static const PolarManifold boundary(center); + tria.set_manifold(0, boundary); tria.refine_global(1); GridOut grid_out; diff --git a/tests/deal.II/grid_hyper_shell_04.cc b/tests/deal.II/grid_hyper_shell_04.cc index e51778c728..7c802f2af6 100644 --- a/tests/deal.II/grid_hyper_shell_04.cc +++ b/tests/deal.II/grid_hyper_shell_04.cc @@ -19,7 +19,7 @@ // this series test the other possibilities for the number of cells #include "../tests.h" -#include +#include #include #include #include @@ -43,8 +43,8 @@ void check (double r1, double r2, unsigned int n) Point center; Triangulation tria (Triangulation::none); GridGenerator::hyper_shell (tria, center, r1, r2, n); - static const HyperShellBoundary boundary(center); - tria.set_boundary(0, boundary); + static const PolarManifold boundary(center); + tria.set_manifold(0, boundary); GridOut grid_out; grid_out.write_gnuplot (tria, logfile); diff --git a/tests/deal.II/grid_out.cc b/tests/deal.II/grid_out.cc index be84422aae..d2a65a538c 100644 --- a/tests/deal.II/grid_out.cc +++ b/tests/deal.II/grid_out.cc @@ -19,8 +19,8 @@ #include "../tests.h" #include #include -#include -#include +#include +#include #include #include #include @@ -36,10 +36,10 @@ template void test () { Triangulation tria; - static const HyperBallBoundary x; + static const PolarManifold x; if (dim == 2) { - tria.set_boundary (0, x); + tria.set_manifold (0, x); GridGenerator::hyper_ball (tria); } else diff --git a/tests/deal.II/grid_output_input.cc b/tests/deal.II/grid_output_input.cc index 7ec3897f18..d8e2ee95c6 100644 --- a/tests/deal.II/grid_output_input.cc +++ b/tests/deal.II/grid_output_input.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -40,8 +40,8 @@ void test(std::ostream &out) Triangulation tr; GridGenerator::hyper_cube_with_cylindrical_hole(tr, .3, .4, 1, 1, false); - CylinderBoundary boundary(.3, 2); - tr.set_boundary(1, boundary); + CylinderManifold boundary(.3, 2); + tr.set_manifold(1, boundary); { std::ofstream grid_file("coarse_grid.inp"); go.write_ucd(tr, grid_file); @@ -51,7 +51,7 @@ void test(std::ostream &out) deallog << "Writing refined from constructor" << std::endl; go.write_ucd(tr, out); - tr.set_boundary(1); + tr.set_manifold(1); tr.clear(); GridIn gi; @@ -63,7 +63,7 @@ void test(std::ostream &out) grid_file.close(); } - tr.set_boundary(1, boundary); + tr.set_manifold(1, boundary); tr.refine_global(1); deallog << "Writing refined from file" << std::endl; go.write_ucd(tr, out); @@ -74,7 +74,7 @@ void test(std::ostream &out) grid_file.close(); } - tr.set_boundary(1); + tr.set_manifold(1); tr.clear(); } diff --git a/tests/deal.II/grid_test.cc b/tests/deal.II/grid_test.cc index 1b333ea250..f6b447073d 100644 --- a/tests/deal.II/grid_test.cc +++ b/tests/deal.II/grid_test.cc @@ -17,7 +17,7 @@ #include "../tests.h" -#include +#include #include #include #include @@ -40,13 +40,13 @@ std::ofstream logfile("output"); template class Ball : - public StraightBoundary + public FlatManifold { public: virtual Point get_new_point_on_line (const typename Triangulation::line_iterator &line) const { - Point middle = StraightBoundary::get_new_point_on_line(line); + Point middle = FlatManifold::get_new_point_on_line(line); for (int i=0; i get_new_point_on_quad (const typename Triangulation::quad_iterator &quad) const { - Point middle = StraightBoundary::get_new_point_on_quad(quad); + Point middle = FlatManifold::get_new_point_on_quad(quad); for (int i=0; i class CurvedLine : - public StraightBoundary + public FlatManifold { public: virtual Point @@ -91,7 +91,7 @@ template Point CurvedLine::get_new_point_on_line (const typename Triangulation::line_iterator &line) const { - Point middle = StraightBoundary::get_new_point_on_line (line); + Point middle = FlatManifold::get_new_point_on_line (line); // if the line is at the top of bottom // face: do a special treatment on @@ -139,7 +139,7 @@ template Point CurvedLine::get_new_point_on_quad (const typename Triangulation::quad_iterator &quad) const { - Point middle = StraightBoundary::get_new_point_on_quad (quad); + Point middle = FlatManifold::get_new_point_on_quad (quad); // if the face is at the top of bottom // face: do not move the midpoint in @@ -222,8 +222,8 @@ void test (const int test_case) { if (dim==3) { - tria.begin_active()->face(4)->set_boundary_indicator(1); - tria.begin_active()->face(5)->set_boundary_indicator(1); + tria.begin_active()->face(4)->set_manifold_indicator(1); + tria.begin_active()->face(5)->set_manifold_indicator(1); }; @@ -231,9 +231,9 @@ void test (const int test_case) Ball ball; CurvedLine curved_line; if (test_case==2) - tria.set_boundary (1, ball); + tria.set_manifold (1, ball); else - tria.set_boundary (1, curved_line); + tria.set_manifold (1, curved_line); // refine once tria.begin_active()->set_refine_flag(); @@ -255,7 +255,7 @@ void test (const int test_case) tria.execute_coarsening_and_refinement(); }; - tria.set_boundary (1); + tria.set_manifold (1); break; } } diff --git a/tests/deal.II/grid_tools_03.cc b/tests/deal.II/grid_tools_03.cc index b342d00ef7..795bf7d07b 100644 --- a/tests/deal.II/grid_tools_03.cc +++ b/tests/deal.II/grid_tools_03.cc @@ -21,7 +21,7 @@ #include "../tests.h" #include #include -#include +#include #include #include #include @@ -60,8 +60,8 @@ void test1 () Triangulation tria; GridGenerator::hyper_ball(tria, Point(), 1); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); for (unsigned int i=0; i<4; ++i) { diff --git a/tests/deal.II/grid_transform.cc b/tests/deal.II/grid_transform.cc index b417626514..cf76d1edc7 100644 --- a/tests/deal.II/grid_transform.cc +++ b/tests/deal.II/grid_transform.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -34,10 +34,10 @@ int main () { const unsigned int dim=2; Point origin; - HyperShellBoundary boundary(origin); + PolarManifold boundary(origin); MappingQ mapping(2); Triangulation 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); @@ -88,7 +88,7 @@ int main () // circle. new_points.insert(std::pair > ( face->vertex_index(vertex_no), n_radius/inner_radius*v+n_center)); - face->set_boundary_indicator(1); + face->set_manifold_indicator(1); } else Assert(false, ExcInternalError()); @@ -97,8 +97,8 @@ int main () } GridGenerator::laplace_transformation (tria, new_points); - HyperBallBoundary inner_ball(n_center, n_radius); - tria.set_boundary(1, inner_ball); + PolarManifold inner_ball(n_center, n_radius); + tria.set_manifold(1, inner_ball); GridOut grid_out; std::ofstream eps_stream2("output"); diff --git a/tests/deal.II/grid_transform_3d.cc b/tests/deal.II/grid_transform_3d.cc index 72f86fd928..3a312a240f 100644 --- a/tests/deal.II/grid_transform_3d.cc +++ b/tests/deal.II/grid_transform_3d.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -35,9 +35,9 @@ int main () { const unsigned int dim=3; Point origin; - CylinderBoundary boundary; + CylinderManifold boundary; Triangulation tria; - tria.set_boundary(0, boundary); + tria.set_manifold(0, boundary); GridGenerator::cylinder(tria, 1, .7); tria.refine_global(2); diff --git a/tests/deal.II/memory_consumption_01.cc b/tests/deal.II/memory_consumption_01.cc index 804e2d24e4..49e8dde817 100644 --- a/tests/deal.II/memory_consumption_01.cc +++ b/tests/deal.II/memory_consumption_01.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -319,8 +319,8 @@ void Step6::run () { GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); triangulation.refine_global (1); } diff --git a/tests/deal.II/no_flux_03.cc b/tests/deal.II/no_flux_03.cc index b1aa01fbd4..b0f590dcbc 100644 --- a/tests/deal.II/no_flux_03.cc +++ b/tests/deal.II/no_flux_03.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -66,8 +66,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); tr.refine_global(2); diff --git a/tests/deal.II/no_flux_04.cc b/tests/deal.II/no_flux_04.cc index 19a06cd992..8f8c9a634a 100644 --- a/tests/deal.II/no_flux_04.cc +++ b/tests/deal.II/no_flux_04.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -125,8 +125,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); tr.refine_global(2); diff --git a/tests/deal.II/no_flux_05.cc b/tests/deal.II/no_flux_05.cc index 6050fc89af..5325aee1bd 100644 --- a/tests/deal.II/no_flux_05.cc +++ b/tests/deal.II/no_flux_05.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include @@ -79,8 +79,8 @@ void test_hyper_cube() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); tr.refine_global(1); diff --git a/tests/deal.II/no_flux_10.cc b/tests/deal.II/no_flux_10.cc index 347e2f79db..5e93d8eb94 100644 --- a/tests/deal.II/no_flux_10.cc +++ b/tests/deal.II/no_flux_10.cc @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include @@ -68,51 +68,51 @@ colorize_sixty_deg_hyper_shell(Triangulation<3> &tria, double radius = cell->face(f)->center().norm() - center.norm(); if (std::fabs(cell->face(f)->center()(2) - sqrt(3.)*cell->face(f)->center()(0)) < eps ) // z = sqrt(3)x set boundary 2 { - cell->face(f)->set_boundary_indicator(2); + cell->face(f)->set_manifold_indicator(2); for (unsigned int j=0; j::lines_per_face; ++j) if (cell->face(f)->line(j)->at_boundary()) if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) > eps) - cell->face(f)->line(j)->set_boundary_indicator(2); + cell->face(f)->line(j)->set_manifold_indicator(2); } else if (std::fabs(cell->face(f)->center()(2) + sqrt(3.)*cell->face(f)->center()(0)) < eps) // z = -sqrt(3)x set boundary 3 { - cell->face(f)->set_boundary_indicator(3); + cell->face(f)->set_manifold_indicator(3); for (unsigned int j=0; j::lines_per_face; ++j) if (cell->face(f)->line(j)->at_boundary()) if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) > eps) - cell->face(f)->line(j)->set_boundary_indicator(3); + cell->face(f)->line(j)->set_manifold_indicator(3); } else if (std::fabs(cell->face(f)->center()(2) - sqrt(3.)*cell->face(f)->center()(1)) < eps ) // z = sqrt(3)y set boundary 4 { - cell->face(f)->set_boundary_indicator(4); + cell->face(f)->set_manifold_indicator(4); for (unsigned int j=0; j::lines_per_face; ++j) if (cell->face(f)->line(j)->at_boundary()) if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) > eps) - cell->face(f)->line(j)->set_boundary_indicator(4); + cell->face(f)->line(j)->set_manifold_indicator(4); } else if (std::fabs(cell->face(f)->center()(2) + sqrt(3.)*cell->face(f)->center()(1)) < eps ) // z = -sqrt(3)y set boundary 5 { - cell->face(f)->set_boundary_indicator(5); + cell->face(f)->set_manifold_indicator(5); for (unsigned int j=0; j::lines_per_face; ++j) if (cell->face(f)->line(j)->at_boundary()) if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) > eps) - cell->face(f)->line(j)->set_boundary_indicator(5); + cell->face(f)->line(j)->set_manifold_indicator(5); } else if (radius < middle) // inner radius set boundary 0 { - cell->face(f)->set_boundary_indicator(0); + cell->face(f)->set_manifold_indicator(0); for (unsigned int j=0; j::lines_per_face; ++j) if (cell->face(f)->line(j)->at_boundary()) if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) < eps) - cell->face(f)->line(j)->set_boundary_indicator(0); + cell->face(f)->line(j)->set_manifold_indicator(0); } else if (radius > middle) // outer radius set boundary 1 { - cell->face(f)->set_boundary_indicator(1); + cell->face(f)->set_manifold_indicator(1); for (unsigned int j=0; j::lines_per_face; ++j) if (cell->face(f)->line(j)->at_boundary()) if (std::fabs(cell->face(f)->line(j)->vertex(0).norm() - cell->face(f)->line(j)->vertex(1).norm()) < eps) - cell->face(f)->line(j)->set_boundary_indicator(1); + cell->face(f)->line(j)->set_manifold_indicator(1); } else AssertThrow (false, ExcInternalError()); @@ -171,8 +171,8 @@ void run() 0.5, 1.0); - static HyperShellBoundary boundary((Point())); - triangulation.set_boundary (0, boundary); + static PolarManifold boundary((Point())); + triangulation.set_manifold (0, boundary); // write out the mesh. may not be // strictly necessary here, but is diff --git a/tests/deal.II/no_flux_hp_03.cc b/tests/deal.II/no_flux_hp_03.cc index f304cf9387..a264c80bc1 100644 --- a/tests/deal.II/no_flux_hp_03.cc +++ b/tests/deal.II/no_flux_hp_03.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -60,8 +60,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); tr.refine_global(2); diff --git a/tests/deal.II/no_flux_hp_04.cc b/tests/deal.II/no_flux_hp_04.cc index 9fdda0c549..42fb80ada1 100644 --- a/tests/deal.II/no_flux_hp_04.cc +++ b/tests/deal.II/no_flux_hp_04.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -118,8 +118,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); tr.refine_global(2); diff --git a/tests/deal.II/no_flux_hp_05.cc b/tests/deal.II/no_flux_hp_05.cc index a4e7e9e4a8..9f06c311ad 100644 --- a/tests/deal.II/no_flux_hp_05.cc +++ b/tests/deal.II/no_flux_hp_05.cc @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -70,8 +70,8 @@ void test_hyper_cube() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); tr.refine_global(1); diff --git a/tests/deal.II/normal_flux_03.cc b/tests/deal.II/normal_flux_03.cc index 152aef1b23..114b91766f 100644 --- a/tests/deal.II/normal_flux_03.cc +++ b/tests/deal.II/normal_flux_03.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -61,8 +61,8 @@ void test_hyper_sphere() Triangulation tr; GridGenerator::hyper_ball(tr); - static const HyperBallBoundary boundary; - tr.set_boundary (0, boundary); + static const PolarManifold boundary; + tr.set_manifold (0, boundary); tr.refine_global(2); diff --git a/tests/deal.II/project_01_curved_boundary.cc b/tests/deal.II/project_01_curved_boundary.cc index 13a3d0a592..5bb0cd2ec2 100644 --- a/tests/deal.II/project_01_curved_boundary.cc +++ b/tests/deal.II/project_01_curved_boundary.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -63,14 +63,14 @@ public: template void test() { - HyperBallBoundary boundary; + PolarManifold boundary; // create 2 triangulations with the // same coarse grid, and refine // them differently Triangulation tria; GridGenerator::hyper_ball (tria); - tria.set_boundary (0, boundary); + tria.set_manifold (0, boundary); FE_Q fe(1); diff --git a/tests/deal.II/project_to_surface_01.cc b/tests/deal.II/project_to_surface_01.cc index 7fda38c7ae..3c57a88d24 100644 --- a/tests/deal.II/project_to_surface_01.cc +++ b/tests/deal.II/project_to_surface_01.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -86,7 +86,7 @@ void test () deallog << "dim=" << dim << std::endl; Triangulation tria; - StraightBoundary boundary; + FlatManifold boundary; for (unsigned int case_no=0; case_no<2; ++case_no) { diff --git a/tests/deal.II/project_to_surface_02.cc b/tests/deal.II/project_to_surface_02.cc index 9e42fc3a6c..bdfabddcf9 100644 --- a/tests/deal.II/project_to_surface_02.cc +++ b/tests/deal.II/project_to_surface_02.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -86,7 +86,7 @@ void test () deallog << "dim=" << dim << std::endl; Triangulation tria; - StraightBoundary boundary; + FlatManifold boundary; for (unsigned int case_no=0; case_no<2; ++case_no) { diff --git a/tests/deal.II/project_to_surface_03.cc b/tests/deal.II/project_to_surface_03.cc index f99a6de525..7ee11c5231 100644 --- a/tests/deal.II/project_to_surface_03.cc +++ b/tests/deal.II/project_to_surface_03.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -40,7 +40,7 @@ void test () deallog << "dim=" << dim << std::endl; Triangulation tria; - StraightBoundary boundary; + FlatManifold boundary; GridGenerator::hyper_cube(tria, 0, 1); diff --git a/tests/fe/cell_similarity_01.cc b/tests/fe/cell_similarity_01.cc index a775f42e01..f3c349b0f7 100644 --- a/tests/fe/cell_similarity_01.cc +++ b/tests/fe/cell_similarity_01.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_02.cc b/tests/fe/cell_similarity_02.cc index f3abedbaa3..853870ea9f 100644 --- a/tests/fe/cell_similarity_02.cc +++ b/tests/fe/cell_similarity_02.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_03.cc b/tests/fe/cell_similarity_03.cc index 560e370884..e9df1e8eb0 100644 --- a/tests/fe/cell_similarity_03.cc +++ b/tests/fe/cell_similarity_03.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_04.cc b/tests/fe/cell_similarity_04.cc index 06a44e2fa3..0563c9b404 100644 --- a/tests/fe/cell_similarity_04.cc +++ b/tests/fe/cell_similarity_04.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_05.cc b/tests/fe/cell_similarity_05.cc index 92f3e798a9..84007365d9 100644 --- a/tests/fe/cell_similarity_05.cc +++ b/tests/fe/cell_similarity_05.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_06.cc b/tests/fe/cell_similarity_06.cc index ea25342768..a901b9e4a8 100644 --- a/tests/fe/cell_similarity_06.cc +++ b/tests/fe/cell_similarity_06.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_07.cc b/tests/fe/cell_similarity_07.cc index d68ce7406b..3eb1c9760e 100644 --- a/tests/fe/cell_similarity_07.cc +++ b/tests/fe/cell_similarity_07.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_08.cc b/tests/fe/cell_similarity_08.cc index 5ec35b03d1..abb4f77398 100644 --- a/tests/fe/cell_similarity_08.cc +++ b/tests/fe/cell_similarity_08.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_09.cc b/tests/fe/cell_similarity_09.cc index f168c575ef..7eaafa9eac 100644 --- a/tests/fe/cell_similarity_09.cc +++ b/tests/fe/cell_similarity_09.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_10.cc b/tests/fe/cell_similarity_10.cc index d595473a6d..a274ab7503 100644 --- a/tests/fe/cell_similarity_10.cc +++ b/tests/fe/cell_similarity_10.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_01.cc b/tests/fe/cell_similarity_dgp_monomial_01.cc index 2d17109e8b..b9acb42c19 100644 --- a/tests/fe/cell_similarity_dgp_monomial_01.cc +++ b/tests/fe/cell_similarity_dgp_monomial_01.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_02.cc b/tests/fe/cell_similarity_dgp_monomial_02.cc index c92552b924..e15c9eccd3 100644 --- a/tests/fe/cell_similarity_dgp_monomial_02.cc +++ b/tests/fe/cell_similarity_dgp_monomial_02.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_03.cc b/tests/fe/cell_similarity_dgp_monomial_03.cc index 667829ef93..f704a30cff 100644 --- a/tests/fe/cell_similarity_dgp_monomial_03.cc +++ b/tests/fe/cell_similarity_dgp_monomial_03.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_04.cc b/tests/fe/cell_similarity_dgp_monomial_04.cc index cc293f730e..2b409d59bc 100644 --- a/tests/fe/cell_similarity_dgp_monomial_04.cc +++ b/tests/fe/cell_similarity_dgp_monomial_04.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_05.cc b/tests/fe/cell_similarity_dgp_monomial_05.cc index d0d8b7308d..6f6b6383a7 100644 --- a/tests/fe/cell_similarity_dgp_monomial_05.cc +++ b/tests/fe/cell_similarity_dgp_monomial_05.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_06.cc b/tests/fe/cell_similarity_dgp_monomial_06.cc index 320a751f4f..e168167578 100644 --- a/tests/fe/cell_similarity_dgp_monomial_06.cc +++ b/tests/fe/cell_similarity_dgp_monomial_06.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_07.cc b/tests/fe/cell_similarity_dgp_monomial_07.cc index 2e7ea87b06..4ecbfe877b 100644 --- a/tests/fe/cell_similarity_dgp_monomial_07.cc +++ b/tests/fe/cell_similarity_dgp_monomial_07.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_08.cc b/tests/fe/cell_similarity_dgp_monomial_08.cc index 5a7a1c0241..14a2086268 100644 --- a/tests/fe/cell_similarity_dgp_monomial_08.cc +++ b/tests/fe/cell_similarity_dgp_monomial_08.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_09.cc b/tests/fe/cell_similarity_dgp_monomial_09.cc index 70fc0c2cd2..742e259968 100644 --- a/tests/fe/cell_similarity_dgp_monomial_09.cc +++ b/tests/fe/cell_similarity_dgp_monomial_09.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_10.cc b/tests/fe/cell_similarity_dgp_monomial_10.cc index 2674c78f07..8ba9536a05 100644 --- a/tests/fe/cell_similarity_dgp_monomial_10.cc +++ b/tests/fe/cell_similarity_dgp_monomial_10.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_01.cc b/tests/fe/cell_similarity_dgp_nonparametric_01.cc index 9f8408ecf8..195619b92e 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_01.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_01.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_02.cc b/tests/fe/cell_similarity_dgp_nonparametric_02.cc index a0cedea1dc..cf446f5ffc 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_02.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_02.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_03.cc b/tests/fe/cell_similarity_dgp_nonparametric_03.cc index c9b5976413..faeb144e61 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_03.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_03.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_04.cc b/tests/fe/cell_similarity_dgp_nonparametric_04.cc index 3a61ff3d76..2dd9fda0ae 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_04.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_04.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_05.cc b/tests/fe/cell_similarity_dgp_nonparametric_05.cc index 0a97684c97..c824830b5c 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_05.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_05.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_06.cc b/tests/fe/cell_similarity_dgp_nonparametric_06.cc index e8524ccbf4..f670050322 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_06.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_06.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_07.cc b/tests/fe/cell_similarity_dgp_nonparametric_07.cc index 956719459c..87728dd148 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_07.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_07.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_08.cc b/tests/fe/cell_similarity_dgp_nonparametric_08.cc index 75e708153b..f0fe0a5150 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_08.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_08.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_09.cc b/tests/fe/cell_similarity_dgp_nonparametric_09.cc index 79262451cb..feac5e995b 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_09.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_09.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_10.cc b/tests/fe/cell_similarity_dgp_nonparametric_10.cc index 73262ee965..3d82e22eed 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_10.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_10.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -152,13 +152,13 @@ void test() subdivisions[0] = 2; GridGenerator::subdivided_hyper_rectangle(tr, subdivisions, p1, p2); - static const HyperBallBoundary boundary(tr.begin_active()->center()); - tr.set_boundary (1, boundary); + static const PolarManifold boundary(tr.begin_active()->center()); + tr.set_manifold (1, boundary); // set boundary id on cell 1 for (unsigned int f=0; f::faces_per_cell; ++f) if (tr.begin_active()->at_boundary(f)) - tr.begin_active()->face(f)->set_boundary_indicator (1); + tr.begin_active()->face(f)->set_manifold_indicator (1); test(tr); } diff --git a/tests/fe/jacobians.cc b/tests/fe/jacobians.cc index 4351b19054..fe77dd4677 100644 --- a/tests/fe/jacobians.cc +++ b/tests/fe/jacobians.cc @@ -25,15 +25,15 @@ #include #include #include -#include +#include template void test() { Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); MappingQ mapping(3); FE_Nothing dummy; diff --git a/tests/fe/mapping.cc b/tests/fe/mapping.cc index d646edf3aa..80cfdc3e32 100644 --- a/tests/fe/mapping.cc +++ b/tests/fe/mapping.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -306,10 +306,10 @@ void create_triangulations(std::vector *> &tria_ptr, v2(1) = 3.; v3(0) = 3.; v3(1) = 3.; - tria->set_boundary(1,*boundary1); - tria->set_boundary(2,*boundary2); - tria->begin_active()->face(1)->set_boundary_indicator(1); - tria->begin_active()->face(3)->set_boundary_indicator(2); + tria->set_manifold(1,*boundary1); + tria->set_manifold(2,*boundary2); + tria->begin_active()->face(1)->set_manifold_indicator(1); + tria->begin_active()->face(3)->set_manifold_indicator(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))); @@ -346,8 +346,8 @@ void create_triangulations(std::vector *> &tria_ptr, v2(1) = 1.; v3(0) = 0.5; v3(1) = 1.5; - tria->set_boundary(1,*boundary1); - tria->begin_active()->face(1)->set_boundary_indicator(1); + tria->set_manifold(1,*boundary1); + tria->begin_active()->face(1)->set_manifold_indicator(1); exact_areas.push_back(0.); for (unsigned int i=0; i<=4; ++i) show[4][i]=1; @@ -401,8 +401,8 @@ void create_triangulations(std::vector *> &tria_ptr, tria=new Triangulation<3>(); tria_ptr.push_back(tria); GridGenerator::hyper_cube(*tria, 1., 3.); - tria->set_boundary(1,*boundary1); - tria->begin_active()->face(1)->set_boundary_indicator(1); + tria->set_manifold(1,*boundary1); + tria->begin_active()->face(1)->set_manifold_indicator(1); exact_areas.push_back(8.+pi/3*h*h*(3*r-h)); } diff --git a/tests/fe/mapping_real_to_unit_02.cc b/tests/fe/mapping_real_to_unit_02.cc index 9c9af6b097..0df81eebdc 100644 --- a/tests/fe/mapping_real_to_unit_02.cc +++ b/tests/fe/mapping_real_to_unit_02.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -37,11 +37,11 @@ template void test2() { - const HyperBallBoundary boundary_description; + const PolarManifold boundary_description; Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - triangulation.set_boundary (0, boundary_description); + triangulation.set_manifold (0, boundary_description); triangulation.refine_global (1); MappingQ1< dim > mapping; @@ -70,7 +70,7 @@ void test2() points[95]=p; fe_function.value_list (points, m); // <<<< this fails at point[95] but only if the other points are filled in?! - triangulation.set_boundary (0); + triangulation.set_manifold (0); deallog << "OK" << std::endl; } diff --git a/tests/fe/mapping_real_to_unit_q4_curved.cc b/tests/fe/mapping_real_to_unit_q4_curved.cc index 3eb7e558cf..666b9c4682 100644 --- a/tests/fe/mapping_real_to_unit_q4_curved.cc +++ b/tests/fe/mapping_real_to_unit_q4_curved.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include @@ -50,8 +50,8 @@ void test_real_to_unit_cell() // set the boundary indicator for // one face of the single cell - triangulation.set_boundary (1, boundary); - triangulation.begin_active()->face(0)->set_boundary_indicator (1); + triangulation.set_manifold (1, boundary); + triangulation.begin_active()->face(0)->set_manifold_indicator (1); const unsigned int n_points = 5; std::vector< Point > unit_points(Utilities::fixed_power(n_points)); diff --git a/tests/fe/mapping_real_to_unit_q4_curved_codim.cc b/tests/fe/mapping_real_to_unit_q4_curved_codim.cc index fd2c553cf4..9c1b8d09a9 100644 --- a/tests/fe/mapping_real_to_unit_q4_curved_codim.cc +++ b/tests/fe/mapping_real_to_unit_q4_curved_codim.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include @@ -50,8 +50,8 @@ void test_real_to_unit_cell() // set the boundary indicator for // one face of the single cell - triangulation.set_boundary (1, boundary); - triangulation.begin_active()->face(0)->set_boundary_indicator (1); + triangulation.set_manifold (1, boundary); + triangulation.begin_active()->face(0)->set_manifold_indicator (1); const unsigned int n_points = 5; std::vector< Point > unit_points(Utilities::fixed_power(n_points)); diff --git a/tests/fe/mapping_real_to_unit_q4_sphere.cc b/tests/fe/mapping_real_to_unit_q4_sphere.cc index fb667f8e92..dacae7c720 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include @@ -46,7 +46,7 @@ void test_real_to_unit_cell() // define a spherical cap boundary // to be used for one of the faces const double radius = Point(1.43757e-10, 4.48023e+06, 4.48023e+06).norm(); - HyperBallBoundary boundary (Point(), radius); + PolarManifold boundary (Point(), radius); // create the mesh: a single cell // with the following coordinates: @@ -77,7 +77,7 @@ void test_real_to_unit_cell() // set the boundary indicator for // one face and adjacent edges of // the single cell - triangulation.set_boundary (1, boundary); + triangulation.set_manifold (1, boundary); triangulation.begin_active()->face(5)->set_all_boundary_indicators (1); // now try to find the coordinates diff --git a/tests/fe/mapping_real_to_unit_q4_sphere_x.cc b/tests/fe/mapping_real_to_unit_q4_sphere_x.cc index 8af5d89bc9..e01f579e2e 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere_x.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere_x.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include @@ -36,7 +36,7 @@ void test_real_to_unit_cell() // define a spherical cap boundary // to be used for one of the faces const double radius = Point(1.43757e-10, 4.48023e+06, 4.48023e+06).norm(); - HyperBallBoundary boundary (Point(), radius); + PolarManifold boundary (Point(), radius); // create the mesh: a single cell // with the following coordinates: @@ -67,7 +67,7 @@ void test_real_to_unit_cell() // set the boundary indicator for // one face and adjacent edges of // the single cell - triangulation.set_boundary (1, boundary); + triangulation.set_manifold (1, boundary); triangulation.begin_active()->face(5)->set_all_boundary_indicators (1); // now try to find the coordinates diff --git a/tests/fe/mapping_real_to_unit_q4_sphere_y.cc b/tests/fe/mapping_real_to_unit_q4_sphere_y.cc index a96c6bc26c..45b4f613d6 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere_y.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere_y.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include @@ -36,7 +36,7 @@ void test_real_to_unit_cell() // define a spherical cap boundary // to be used for one of the faces const double radius = Point(1.43757e-10, 4.48023e+06, 4.48023e+06).norm(); - HyperBallBoundary boundary (Point(), radius); + PolarManifold boundary (Point(), radius); // create the mesh: a single cell // with the following coordinates: @@ -67,7 +67,7 @@ void test_real_to_unit_cell() // set the boundary indicator for // one face and adjacent edges of // the single cell - triangulation.set_boundary (1, boundary); + triangulation.set_manifold (1, boundary); triangulation.begin_active()->face(5)->set_all_boundary_indicators (1); // now try to find the coordinates diff --git a/tests/fe/mapping_real_to_unit_q4_sphere_z.cc b/tests/fe/mapping_real_to_unit_q4_sphere_z.cc index 3a839f6764..e106281c38 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere_z.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere_z.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include @@ -36,7 +36,7 @@ void test_real_to_unit_cell() // define a spherical cap boundary // to be used for one of the faces const double radius = Point(1.43757e-10, 4.48023e+06, 4.48023e+06).norm(); - HyperBallBoundary boundary (Point(), radius); + PolarManifold boundary (Point(), radius); // create the mesh: a single cell // with the following coordinates: @@ -67,7 +67,7 @@ void test_real_to_unit_cell() // set the boundary indicator for // one face and adjacent edges of // the single cell - triangulation.set_boundary (1, boundary); + triangulation.set_manifold (1, boundary); triangulation.begin_active()->face(5)->set_all_boundary_indicators (1); // now see if the point is inside diff --git a/tests/grid/grid_generator_01a.cc b/tests/grid/grid_generator_01a.cc index d2f29ff513..99749476e2 100644 --- a/tests/grid/grid_generator_01a.cc +++ b/tests/grid/grid_generator_01a.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -47,7 +47,7 @@ void test(std::ostream &out) if (dim>1) p3[1] = 1.; if (dim>2) p3[2] = 4.; - HalfHyperBallBoundary boundary_description (p1, 3); + HalfPolarManifold boundary_description (p1, 3); GridOut go; GridOut::OutputFormat format = GridOut::gnuplot; @@ -55,7 +55,7 @@ void test(std::ostream &out) deallog << "half_hyper_ball" << std::endl; Triangulation tr; GridGenerator::half_hyper_ball(tr, p1, 3.); - tr.set_boundary (0, boundary_description); + tr.set_manifold (0, boundary_description); tr.refine_global (2); go.write(tr, out, format); diff --git a/tests/hp/project_01_curved_boundary.cc b/tests/hp/project_01_curved_boundary.cc index 2bfed59373..cb3d056b2d 100644 --- a/tests/hp/project_01_curved_boundary.cc +++ b/tests/hp/project_01_curved_boundary.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -64,14 +64,14 @@ public: template void test() { - HyperBallBoundary boundary; + PolarManifold boundary; // create 2 triangulations with the // same coarse grid, and refine // them differently Triangulation tria; GridGenerator::hyper_ball (tria); - tria.set_boundary (0, boundary); + tria.set_manifold (0, boundary); hp::FECollection fe; diff --git a/tests/hp/step-10.cc b/tests/hp/step-10.cc index ed6f02f7cf..330075c526 100644 --- a/tests/hp/step-10.cc +++ b/tests/hp/step-10.cc @@ -30,7 +30,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -56,8 +56,8 @@ void gnuplot_output() Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); for (unsigned int refinement=0; refinement<2; ++refinement, triangulation.refine_global(1)) @@ -99,8 +99,8 @@ void compute_pi_by_area () Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); MappingQ m(degree); const hp::MappingCollection mapping (m); @@ -166,8 +166,8 @@ void compute_pi_by_perimeter () Triangulation triangulation; GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); const MappingQ m (degree); const hp::MappingCollection mapping(m); diff --git a/tests/hp/step-11.cc b/tests/hp/step-11.cc index 994d146876..ab02f94c77 100644 --- a/tests/hp/step-11.cc +++ b/tests/hp/step-11.cc @@ -35,7 +35,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -197,8 +197,8 @@ template void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); for (unsigned int cycle=0; cycle<6; ++cycle, triangulation.refine_global(1)) { diff --git a/tests/hp/step-11_compressed_set_sparsity.cc b/tests/hp/step-11_compressed_set_sparsity.cc index d0c6e36b2f..5169a69e76 100644 --- a/tests/hp/step-11_compressed_set_sparsity.cc +++ b/tests/hp/step-11_compressed_set_sparsity.cc @@ -38,7 +38,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -200,8 +200,8 @@ template void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); for (unsigned int cycle=0; cycle<6; ++cycle, triangulation.refine_global(1)) { diff --git a/tests/hp/step-5.cc b/tests/hp/step-5.cc index 3bff1ee618..2964877e60 100644 --- a/tests/hp/step-5.cc +++ b/tests/hp/step-5.cc @@ -47,7 +47,7 @@ std::ofstream logfile("output"); #include -#include +#include #include #include @@ -304,8 +304,8 @@ void LaplaceProblem::run () grid_in.read_ucd (input_file); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); } deallog << " Number of active cells: " diff --git a/tests/hp/step-6.cc b/tests/hp/step-6.cc index ed805aa9cd..2a34966443 100644 --- a/tests/hp/step-6.cc +++ b/tests/hp/step-6.cc @@ -38,7 +38,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -337,8 +337,8 @@ void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); triangulation.refine_global (1); } diff --git a/tests/matrix_free/get_functions_circle.cc b/tests/matrix_free/get_functions_circle.cc index eab595cb6f..79a9f4791f 100644 --- a/tests/matrix_free/get_functions_circle.cc +++ b/tests/matrix_free/get_functions_circle.cc @@ -34,8 +34,8 @@ void test () { Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); // refine first and last cell tria.begin(tria.n_levels()-1)->set_refine_flag(); tria.last()->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_gl.cc b/tests/matrix_free/get_functions_gl.cc index a5b2dd1b90..350ab0f438 100644 --- a/tests/matrix_free/get_functions_gl.cc +++ b/tests/matrix_free/get_functions_gl.cc @@ -91,8 +91,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); // refine first and last cell tria.begin(tria.n_levels()-1)->set_refine_flag(); tria.last()->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_mappingq.cc b/tests/matrix_free/get_functions_mappingq.cc index 866eea77c3..dfa41da404 100644 --- a/tests/matrix_free/get_functions_mappingq.cc +++ b/tests/matrix_free/get_functions_mappingq.cc @@ -35,8 +35,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); // refine first and last cell tria.begin(tria.n_levels()-1)->set_refine_flag(); tria.last()->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_q_hierarchical.cc b/tests/matrix_free/get_functions_q_hierarchical.cc index 01601f2944..760f5956b9 100644 --- a/tests/matrix_free/get_functions_q_hierarchical.cc +++ b/tests/matrix_free/get_functions_q_hierarchical.cc @@ -94,8 +94,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); // refine first and last cell tria.begin(tria.n_levels()-1)->set_refine_flag(); tria.last()->set_refine_flag(); diff --git a/tests/matrix_free/get_functions_rect.cc b/tests/matrix_free/get_functions_rect.cc index 881125ad79..13af19b4d7 100644 --- a/tests/matrix_free/get_functions_rect.cc +++ b/tests/matrix_free/get_functions_rect.cc @@ -56,8 +56,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); // refine first and last cell tria.begin(tria.n_levels()-1)->set_refine_flag(); tria.last()->set_refine_flag(); diff --git a/tests/matrix_free/get_values_plain.cc b/tests/matrix_free/get_values_plain.cc index 378006b9e1..57e9c9b234 100644 --- a/tests/matrix_free/get_values_plain.cc +++ b/tests/matrix_free/get_values_plain.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -143,9 +143,9 @@ void test () { Triangulation tria; GridGenerator::hyper_shell (tria, Point(), 1., 2., 96, true); - static const HyperShellBoundary boundary; - tria.set_boundary (0, boundary); - tria.set_boundary (1, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); + tria.set_manifold (1, boundary); // refine a few cells for (unsigned int i=0; i<11-3*dim; ++i) diff --git a/tests/matrix_free/integrate_functions.cc b/tests/matrix_free/integrate_functions.cc index 313a249d87..51ce6406b8 100644 --- a/tests/matrix_free/integrate_functions.cc +++ b/tests/matrix_free/integrate_functions.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -148,8 +148,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); typename Triangulation::active_cell_iterator cell = tria.begin_active (), endc = tria.end(); diff --git a/tests/matrix_free/integrate_functions_multife.cc b/tests/matrix_free/integrate_functions_multife.cc index 2f3f7fe0bb..8797ba311e 100644 --- a/tests/matrix_free/integrate_functions_multife.cc +++ b/tests/matrix_free/integrate_functions_multife.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -229,8 +229,8 @@ void test () // cells Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); typename Triangulation::active_cell_iterator cell = tria.begin_active (), endc = tria.end(); diff --git a/tests/matrix_free/matrix_vector_04.cc b/tests/matrix_free/matrix_vector_04.cc index 36b71b3aaa..0fdc5a1e62 100644 --- a/tests/matrix_free/matrix_vector_04.cc +++ b/tests/matrix_free/matrix_vector_04.cc @@ -34,9 +34,9 @@ void test () Triangulation tria; GridGenerator::hyper_shell (tria, Point(), 0.5, 1., 96, true); - static const HyperShellBoundary boundary; - tria.set_boundary (0, boundary); - tria.set_boundary (1, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); + tria.set_manifold (1, boundary); if (dim == 2) tria.refine_global (2); diff --git a/tests/matrix_free/matrix_vector_07.cc b/tests/matrix_free/matrix_vector_07.cc index 663b35ff98..20bd36a4bd 100644 --- a/tests/matrix_free/matrix_vector_07.cc +++ b/tests/matrix_free/matrix_vector_07.cc @@ -38,8 +38,8 @@ void test () { Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); typename Triangulation::active_cell_iterator cell = tria.begin_active (), endc = tria.end(); diff --git a/tests/matrix_free/matrix_vector_curl.cc b/tests/matrix_free/matrix_vector_curl.cc index 2993a1f2ba..f67eea6757 100644 --- a/tests/matrix_free/matrix_vector_curl.cc +++ b/tests/matrix_free/matrix_vector_curl.cc @@ -34,7 +34,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -107,8 +107,8 @@ void test () { Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); tria.refine_global(4-dim); // refine a few cells diff --git a/tests/matrix_free/matrix_vector_hp.cc b/tests/matrix_free/matrix_vector_hp.cc index a56cfd84b5..f3c105a094 100644 --- a/tests/matrix_free/matrix_vector_hp.cc +++ b/tests/matrix_free/matrix_vector_hp.cc @@ -99,8 +99,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); tria.refine_global(1); // refine a few cells diff --git a/tests/matrix_free/matrix_vector_mg.cc b/tests/matrix_free/matrix_vector_mg.cc index c86f675a40..c0ad6c688e 100644 --- a/tests/matrix_free/matrix_vector_mg.cc +++ b/tests/matrix_free/matrix_vector_mg.cc @@ -37,8 +37,8 @@ void test () { Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); tria.refine_global(5-dim); FE_Q fe (fe_degree); diff --git a/tests/matrix_free/matrix_vector_stokes_noflux.cc b/tests/matrix_free/matrix_vector_stokes_noflux.cc index c4cfd300ae..759e6265a7 100644 --- a/tests/matrix_free/matrix_vector_stokes_noflux.cc +++ b/tests/matrix_free/matrix_vector_stokes_noflux.cc @@ -34,7 +34,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -125,9 +125,9 @@ void test () Triangulation triangulation; GridGenerator::hyper_shell (triangulation, Point(), 0.5, 1., 96, true); - static HyperShellBoundary boundary; - triangulation.set_boundary (0, boundary); - triangulation.set_boundary (1, boundary); + static PolarManifold boundary; + triangulation.set_manifold (0, boundary); + triangulation.set_manifold (1, boundary); triangulation.begin_active()->set_refine_flag(); triangulation.last()->set_refine_flag(); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/matrix_free/no_index_initialize.cc b/tests/matrix_free/no_index_initialize.cc index 3c2af197fc..82018416e1 100644 --- a/tests/matrix_free/no_index_initialize.cc +++ b/tests/matrix_free/no_index_initialize.cc @@ -32,7 +32,7 @@ std::ofstream logfile("output"); #include #include #include -#include +#include #include #include #include @@ -174,8 +174,8 @@ void test () { Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); // refine first and last cell tria.begin(tria.n_levels()-1)->set_refine_flag(); tria.last()->set_refine_flag(); diff --git a/tests/matrix_free/quadrature_points.cc b/tests/matrix_free/quadrature_points.cc index 206b90ef73..245b651716 100644 --- a/tests/matrix_free/quadrature_points.cc +++ b/tests/matrix_free/quadrature_points.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -48,8 +48,8 @@ void test () typedef double number; Triangulation tria; GridGenerator::hyper_ball (tria); - static const HyperBallBoundary boundary; - tria.set_boundary (0, boundary); + static const PolarManifold boundary; + tria.set_manifold (0, boundary); tria.refine_global(5-dim); MappingQ mapping (4); diff --git a/tests/mpi/multigrid_adaptive.cc b/tests/mpi/multigrid_adaptive.cc index 95d256af9e..a90a20f392 100644 --- a/tests/mpi/multigrid_adaptive.cc +++ b/tests/mpi/multigrid_adaptive.cc @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include @@ -463,8 +463,8 @@ namespace Step50 { GridGenerator::hyper_cube (triangulation); - // static const HyperBallBoundary boundary; - // triangulation.set_boundary (0, boundary); + // static const PolarManifold boundary; + // triangulation.set_manifold (0, boundary); triangulation.refine_global (2); } diff --git a/tests/mpi/multigrid_uniform.cc b/tests/mpi/multigrid_uniform.cc index 50af594234..4181eddc8e 100644 --- a/tests/mpi/multigrid_uniform.cc +++ b/tests/mpi/multigrid_uniform.cc @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include @@ -456,8 +456,8 @@ namespace Step50 { GridGenerator::hyper_cube (triangulation); - // static const HyperBallBoundary boundary; - // triangulation.set_boundary (0, boundary); + // static const PolarManifold boundary; + // triangulation.set_manifold (0, boundary); triangulation.refine_global (3); } diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.cc b/tests/mpi/p4est_2d_constraintmatrix_03.cc index c7bab7f9a3..badf5d2492 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include @@ -111,9 +111,9 @@ void test() R1, 12, true); - static HyperShellBoundary boundary; - tr.set_boundary (0, boundary); - tr.set_boundary (1, boundary); + static PolarManifold boundary; + tr.set_manifold (0, boundary); + tr.set_manifold (1, boundary); tr.refine_global (1); for (unsigned int step=0; step<20; ++step) @@ -218,8 +218,8 @@ void test() cat_file((std::string("dat.") + Utilities::int_to_string(0)).c_str()); } - tr.set_boundary (0); - tr.set_boundary (1); + tr.set_manifold (0); + tr.set_manifold (1); } diff --git a/tests/mpi/p4est_2d_constraintmatrix_04.cc b/tests/mpi/p4est_2d_constraintmatrix_04.cc index d5940f956f..d3a30412f1 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include @@ -147,9 +147,9 @@ void test() R1, 12, true); - static HyperShellBoundary boundary; -// tr.set_boundary (0, boundary); -// tr.set_boundary (1, boundary); + static PolarManifold boundary; +// tr.set_manifold (0, boundary); +// tr.set_manifold (1, boundary); tr.refine_global (3); if (1) @@ -311,8 +311,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 b30e4008e3..1c5465f5f3 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include @@ -146,9 +146,9 @@ void test() R1, 12, true); - static HyperShellBoundary boundary; -// tr.set_boundary (0, boundary); -//tr.set_boundary (1, boundary); + static PolarManifold boundary; +// tr.set_manifold (0, boundary); +//tr.set_manifold (1, boundary); tr.refine_global (1); if (1) @@ -306,8 +306,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/multigrid/step-16-02.cc b/tests/multigrid/step-16-02.cc index 66a9e22e6c..cece429dad 100644 --- a/tests/multigrid/step-16-02.cc +++ b/tests/multigrid/step-16-02.cc @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include @@ -566,8 +566,8 @@ void LaplaceProblem::run () { GridGenerator::hyper_cube (triangulation, -1, 1); -// static const HyperBallBoundary boundary; -// triangulation.set_boundary (0, boundary); +// static const PolarManifold boundary; +// triangulation.set_manifold (0, boundary); triangulation.refine_global (1); } diff --git a/tests/multigrid/step-16.cc b/tests/multigrid/step-16.cc index ab5c4b41db..1e5dcad9e8 100644 --- a/tests/multigrid/step-16.cc +++ b/tests/multigrid/step-16.cc @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include @@ -561,8 +561,8 @@ void LaplaceProblem::run () { GridGenerator::hyper_ball (triangulation); - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); + static const PolarManifold boundary; + triangulation.set_manifold (0, boundary); triangulation.refine_global (1); }