From: Wolfgang Bangerth Date: Sat, 11 Apr 2015 23:27:12 +0000 (-0500) Subject: Adjust tests: Use the non-deprecated version *_boundary_id() instead of *_boundary_in... X-Git-Tag: v8.3.0-rc1~288^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47378e468c4e4abb80acc49703018b08dbe54fad;p=dealii.git Adjust tests: Use the non-deprecated version *_boundary_id() instead of *_boundary_indicators(). --- diff --git a/tests/benchmarks/step-22/step-22.cc b/tests/benchmarks/step-22/step-22.cc index 613f0a3ecd..ba2a28c82a 100644 --- a/tests/benchmarks/step-22/step-22.cc +++ b/tests/benchmarks/step-22/step-22.cc @@ -1287,7 +1287,7 @@ namespace Step22 cell != triangulation.end(); ++cell) for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->face(f)->center()[dim-1] == 0) - cell->face(f)->set_all_boundary_indicators(1); + cell->face(f)->set_all_boundary_ids(1); // We then apply an initial refinement diff --git a/tests/benchmarks/test_assembly/step-22.cc b/tests/benchmarks/test_assembly/step-22.cc index 3f0248e5be..97d0c8629d 100644 --- a/tests/benchmarks/test_assembly/step-22.cc +++ b/tests/benchmarks/test_assembly/step-22.cc @@ -1266,7 +1266,7 @@ namespace Step22 cell != triangulation.end(); ++cell) for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->face(f)->center()[dim-1] == 0) - cell->face(f)->set_all_boundary_indicators(1); + cell->face(f)->set_all_boundary_ids(1); // We then apply an initial refinement diff --git a/tests/bits/anna_4.cc b/tests/bits/anna_4.cc index 6bfe6cc768..b4486345d1 100644 --- a/tests/bits/anna_4.cc +++ b/tests/bits/anna_4.cc @@ -190,15 +190,15 @@ void FindBug::dirichlet_conditions () std::vector fixed_dofs (dof_handler.n_dofs()); - std::set boundary_indicators; - boundary_indicators.insert (0); + std::set boundary_ids; + boundary_ids.insert (0); // get a list of those boundary DoFs which // we want to be fixed: DoFTools::extract_boundary_dofs (dof_handler, component_mask, fixed_dofs, - boundary_indicators); + boundary_ids); // (Primitive) Check if the DoFs // where adjusted correctly (note diff --git a/tests/bits/anna_6.cc b/tests/bits/anna_6.cc index 82ebf4635c..0ef3d136f4 100644 --- a/tests/bits/anna_6.cc +++ b/tests/bits/anna_6.cc @@ -186,12 +186,12 @@ void ImposeBC::test_extract_boundary_DoFs () bc_component_select[2] = false; std::vector ned_boundary_dofs (dof_handler.n_dofs()); - std::set boundary_indicators; - boundary_indicators.insert (0); + std::set boundary_ids; + boundary_ids.insert (0); DoFTools::extract_boundary_dofs (dof_handler, bc_component_select, ned_boundary_dofs, - boundary_indicators); + boundary_ids); for (unsigned int i=0; i::test_interpolate_BC () // (the pressure is assumed to be set to 1 // on the boundary) std::vector p_boundary_dofs (dof_handler.n_dofs()); - std::set boundary_indicators; - boundary_indicators.insert (0); + std::set boundary_ids; + boundary_ids.insert (0); DoFTools::extract_boundary_dofs (dof_handler, bc_component_select, p_boundary_dofs, - boundary_indicators); + boundary_ids); for (unsigned int i=0; iboundary_indicator() << " " + << (int)face->boundary_id() << " " << '<' << face->vertex(0) << '>' << std::endl << " <" << face->vertex(1) << '>' << std::endl << " <" << face->vertex(2) << '>' << std::endl diff --git a/tests/bits/distorted_cells_03.cc b/tests/bits/distorted_cells_03.cc index 39dce277e7..7edbcf70de 100644 --- a/tests/bits/distorted_cells_03.cc +++ b/tests/bits/distorted_cells_03.cc @@ -85,7 +85,7 @@ 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.begin_active()->face(f)->set_boundary_id (1); coarse_grid.set_boundary (1, my_boundary); // now try to refine this one diff --git a/tests/bits/distorted_cells_04.cc b/tests/bits/distorted_cells_04.cc index 76aa7a16fb..ed1c51d240 100644 --- a/tests/bits/distorted_cells_04.cc +++ b/tests/bits/distorted_cells_04.cc @@ -118,7 +118,7 @@ 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.begin_active()->face(f)->set_boundary_id (1); coarse_grid.set_boundary (1, my_boundary); // now try to refine this one diff --git a/tests/bits/distorted_cells_05.cc b/tests/bits/distorted_cells_05.cc index 9467a36927..16bac1f512 100644 --- a/tests/bits/distorted_cells_05.cc +++ b/tests/bits/distorted_cells_05.cc @@ -120,7 +120,7 @@ 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.begin_active()->face(f)->set_boundary_id (1); coarse_grid.set_boundary (1, my_boundary); // now try to refine this one diff --git a/tests/bits/distorted_cells_06.cc b/tests/bits/distorted_cells_06.cc index 06de677356..e6d8153dff 100644 --- a/tests/bits/distorted_cells_06.cc +++ b/tests/bits/distorted_cells_06.cc @@ -78,7 +78,7 @@ 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.begin_active()->face(f)->line(e)->set_boundary_id (99); coarse_grid.set_boundary (99, my_boundary); // now try to refine this one diff --git a/tests/bits/dof_tools_21_b.cc b/tests/bits/dof_tools_21_b.cc index d0960d19f2..c3016e253e 100644 --- a/tests/bits/dof_tools_21_b.cc +++ b/tests/bits/dof_tools_21_b.cc @@ -107,8 +107,8 @@ void generate_grid(Triangulation<2> &triangulation, int orientation) if (cell_2->face(j)->center()(1) < -2.9) face_2 = cell_2->face(j); } - face_1->set_boundary_indicator(42); - face_2->set_boundary_indicator(43); + face_1->set_boundary_id(42); + face_2->set_boundary_id(43); triangulation.refine_global(0); } @@ -182,8 +182,8 @@ void generate_grid(Triangulation<3> &triangulation, int orientation) if (cell_2->face(j)->center()(2) < -2.9) face_2 = cell_2->face(j); } - face_1->set_boundary_indicator(42); - face_2->set_boundary_indicator(43); + face_1->set_boundary_id(42); + face_2->set_boundary_id(43); triangulation.refine_global(0); } diff --git a/tests/bits/dof_tools_21_b_x.cc b/tests/bits/dof_tools_21_b_x.cc index 3010141ad8..4fd157eb4b 100644 --- a/tests/bits/dof_tools_21_b_x.cc +++ b/tests/bits/dof_tools_21_b_x.cc @@ -105,8 +105,8 @@ void generate_grid(Triangulation<2> &triangulation) if (cell_2->face(j)->center()(1) < -2.9) face_2 = cell_2->face(j); } - face_1->set_boundary_indicator(42); - face_2->set_boundary_indicator(43); + face_1->set_boundary_id(42); + face_2->set_boundary_id(43); } diff --git a/tests/bits/dof_tools_21_b_x_q3.cc b/tests/bits/dof_tools_21_b_x_q3.cc index 991a9755de..cca2f2c94c 100644 --- a/tests/bits/dof_tools_21_b_x_q3.cc +++ b/tests/bits/dof_tools_21_b_x_q3.cc @@ -139,8 +139,8 @@ void generate_grid(Triangulation<2> &triangulation) if (cell_2->face(j)->center()(1) < -2.9) face_2 = cell_2->face(j); } - face_1->set_boundary_indicator(42); - face_2->set_boundary_indicator(43); + face_1->set_boundary_id(42); + face_2->set_boundary_id(43); } diff --git a/tests/bits/dof_tools_21_b_y.cc b/tests/bits/dof_tools_21_b_y.cc index eddba0559f..3d8ecf9eb3 100644 --- a/tests/bits/dof_tools_21_b_y.cc +++ b/tests/bits/dof_tools_21_b_y.cc @@ -104,8 +104,8 @@ void generate_grid(Triangulation<2> &triangulation) if (cell_2->face(j)->center()(1) < -2.9) face_2 = cell_2->face(j); } - face_1->set_boundary_indicator(42); - face_2->set_boundary_indicator(43); + face_1->set_boundary_id(42); + face_2->set_boundary_id(43); } diff --git a/tests/bits/dof_tools_21_c.cc b/tests/bits/dof_tools_21_c.cc index 47730d34ec..d3f2fb7846 100644 --- a/tests/bits/dof_tools_21_c.cc +++ b/tests/bits/dof_tools_21_c.cc @@ -110,8 +110,8 @@ void generate_grid(Triangulation<2> &triangulation, int orientation) if (cell_2->face(j)->center()(1) < -2.9) face_2 = cell_2->face(j); } - face_1->set_boundary_indicator(42); - face_2->set_boundary_indicator(43); + face_1->set_boundary_id(42); + face_2->set_boundary_id(43); cell_2->set_refine_flag(); triangulation.execute_coarsening_and_refinement(); @@ -186,8 +186,8 @@ void generate_grid(Triangulation<3> &triangulation, int orientation) if (cell_2->face(j)->center()(2) < -2.9) face_2 = cell_2->face(j); } - face_1->set_boundary_indicator(42); - face_2->set_boundary_indicator(43); + face_1->set_boundary_id(42); + face_2->set_boundary_id(43); cell_2->set_refine_flag(); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/bits/dof_tools_common.h b/tests/bits/dof_tools_common.h index cf27bbe4c3..8f498fe5ae 100644 --- a/tests/bits/dof_tools_common.h +++ b/tests/bits/dof_tools_common.h @@ -62,7 +62,7 @@ void set_boundary_ids (Triangulation &tria) { for (unsigned int f=0; f::faces_per_cell; ++f) - tria.begin_active()->face(f)->set_boundary_indicator (f); + tria.begin_active()->face(f)->set_boundary_id (f); } diff --git a/tests/bits/get_boundary_indicators_1d.cc b/tests/bits/get_boundary_indicators_1d.cc index 670cded373..1265d16721 100644 --- a/tests/bits/get_boundary_indicators_1d.cc +++ b/tests/bits/get_boundary_indicators_1d.cc @@ -19,7 +19,7 @@ #include #include -// Check if Triangulation<1>::get_boundary_indicators() works for 1d grids. +// Check if Triangulation<1>::get_boundary_ids() works for 1d grids. int main () @@ -30,7 +30,7 @@ int main () Triangulation<1> triangulation; GridGenerator::hyper_cube (triangulation, -1, 1); - const std::vector indicators = triangulation.get_boundary_indicators(); + const std::vector indicators = triangulation.get_boundary_ids(); for (unsigned int i=0; iboundary_indicator() << " " + << (int)face->boundary_id() << " " << face->vertex_index(0) << " <" << face->vertex(0) << '>' << std::endl diff --git a/tests/bits/periodicity_05.cc b/tests/bits/periodicity_05.cc index 17bb166a41..3e06f0cee9 100644 --- a/tests/bits/periodicity_05.cc +++ b/tests/bits/periodicity_05.cc @@ -133,10 +133,10 @@ void Deal2PeriodicBug::makeGrid() deallog<< "Constructing the grid..." < p1(0,0), p2(1,1); GridGenerator::hyper_rectangle(triangulation,p1,p2); - triangulation.begin_active()->face(2)->set_boundary_indicator(1); - triangulation.begin_active()->face(3)->set_boundary_indicator(1); - triangulation.begin_active()->face(0)->set_boundary_indicator(0); - triangulation.begin_active()->face(1)->set_boundary_indicator(2); + triangulation.begin_active()->face(2)->set_boundary_id(1); + triangulation.begin_active()->face(3)->set_boundary_id(1); + triangulation.begin_active()->face(0)->set_boundary_id(0); + triangulation.begin_active()->face(1)->set_boundary_id(2); triangulation.refine_global(1); Triangulation<2>::active_cell_iterator cell = triangulation.begin_active(); diff --git a/tests/bits/static_condensation.cc b/tests/bits/static_condensation.cc index 14ffae21d5..56b3dfb96d 100644 --- a/tests/bits/static_condensation.cc +++ b/tests/bits/static_condensation.cc @@ -388,7 +388,7 @@ void HelmholtzProblem::assemble_system (const bool do_reconstruct) for (unsigned int face=0; face::faces_per_cell; ++face) if (cell->face(face)->at_boundary() && - (cell->face(face)->boundary_indicator() == 1)) + (cell->face(face)->boundary_id() == 1)) { x_fe_face_values.reinit (cell, face); const FEFaceValues &fe_face_values @@ -627,7 +627,7 @@ void HelmholtzProblem::run () if ((cell->face(face)->center()(0) == -1) || (cell->face(face)->center()(1) == -1)) - cell->face(face)->set_boundary_indicator (1); + cell->face(face)->set_boundary_id (1); } else refine_grid (); diff --git a/tests/bits/step-51.cc b/tests/bits/step-51.cc index 78682b09e9..2ae285dd65 100644 --- a/tests/bits/step-51.cc +++ b/tests/bits/step-51.cc @@ -691,7 +691,7 @@ namespace Step51 if (cell->face(face)->at_boundary() && - (cell->face(face)->boundary_indicator() == 1)) + (cell->face(face)->boundary_id() == 1)) { const double neumann_value = - scratch.exact_solution.gradient (quadrature_point) * normal @@ -931,7 +931,7 @@ namespace Step51 if (cell->face(face)->at_boundary()) for (unsigned int d=0; dface(face)->center()(d) - (1)) < 1e-12)) - cell->face(face)->set_boundary_indicator (1); + cell->face(face)->set_boundary_id (1); } diff --git a/tests/bits/step-51p.cc b/tests/bits/step-51p.cc index 969634544a..11b39616ac 100644 --- a/tests/bits/step-51p.cc +++ b/tests/bits/step-51p.cc @@ -691,7 +691,7 @@ namespace Step51 if (cell->face(face)->at_boundary() && - (cell->face(face)->boundary_indicator() == 1)) + (cell->face(face)->boundary_id() == 1)) { const double neumann_value = - scratch.exact_solution.gradient (quadrature_point) * normal @@ -929,7 +929,7 @@ namespace Step51 if (cell->face(face)->at_boundary()) for (unsigned int d=0; dface(face)->center()(d) - (1)) < 1e-12)) - cell->face(face)->set_boundary_indicator (1); + cell->face(face)->set_boundary_id (1); } diff --git a/tests/bits/step-7.cc b/tests/bits/step-7.cc index b3dcb08f0f..f4dbc3fbbd 100644 --- a/tests/bits/step-7.cc +++ b/tests/bits/step-7.cc @@ -328,7 +328,7 @@ void HelmholtzProblem::assemble_system () for (unsigned int face=0; face::faces_per_cell; ++face) if (cell->face(face)->at_boundary() && - (cell->face(face)->boundary_indicator() == 1)) + (cell->face(face)->boundary_id() == 1)) { x_fe_face_values.reinit (cell, face); const FEFaceValues &fe_face_values @@ -504,7 +504,7 @@ void HelmholtzProblem::run () if ((cell->face(face)->center()(0) == -1) || (cell->face(face)->center()(1) == -1)) - cell->face(face)->set_boundary_indicator (1); + cell->face(face)->set_boundary_id (1); } else refine_grid (); diff --git a/tests/codim_one/boundary_indicator_01.cc b/tests/codim_one/boundary_indicator_01.cc index ee77169888..dc66180e7a 100644 --- a/tests/codim_one/boundary_indicator_01.cc +++ b/tests/codim_one/boundary_indicator_01.cc @@ -17,11 +17,11 @@ // for surfaces, we need some sort of mapping also for interior cells // and faces, but at the time of writing this, we can only set -// boundary_indicators of faces and edges that are truly at the +// boundary_ids of faces and edges that are truly at the // boundary of the domain. to work around this, we use the material_id // field that one can set on cells, and copy it also to the adjacent // faces. initially, however, we also copied the material_id to the -// boundary_indicator of adjacent faces that truly were at the +// boundary_id of adjacent faces that truly were at the // boundary of the domain, and which might have had something // purposefully set already // @@ -74,7 +74,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_boundary_id(1); done = true; break; } @@ -88,10 +88,10 @@ int main () // now extract a mesh of the 5 // surface faces - std::set boundary_indicators; - boundary_indicators.insert (0); + std::set boundary_ids; + boundary_ids.insert (0); GridGenerator::extract_boundary_mesh (volume_mesh, boundary_mesh, - boundary_indicators); + boundary_ids); deallog << volume_mesh.n_active_cells () << std::endl; deallog << boundary_mesh.n_active_cells () << std::endl; @@ -107,7 +107,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_boundary_id(1); boundary_mesh.refine_global (2); diff --git a/tests/codim_one/extract_boundary_mesh_00.cc b/tests/codim_one/extract_boundary_mesh_00.cc index 83d648425a..0951db108b 100644 --- a/tests/codim_one/extract_boundary_mesh_00.cc +++ b/tests/codim_one/extract_boundary_mesh_00.cc @@ -104,7 +104,7 @@ int main () Triangulation volume_mesh; GridGenerator::hyper_cube(volume_mesh); - volume_mesh.begin_active()->face(0)->set_boundary_indicator(1); + volume_mesh.begin_active()->face(0)->set_boundary_id(1); volume_mesh.refine_global (1); save_mesh(volume_mesh); @@ -135,7 +135,7 @@ int main () Triangulation volume_mesh; GridGenerator::hyper_cube(volume_mesh); - volume_mesh.begin_active()->face(0)->set_boundary_indicator(1); + volume_mesh.begin_active()->face(0)->set_boundary_id(1); volume_mesh.refine_global (1); save_mesh(volume_mesh); @@ -168,7 +168,7 @@ int main () Triangulation volume_mesh; GridGenerator::hyper_cube(volume_mesh); - volume_mesh.begin_active()->face(0)->set_boundary_indicator(1); + volume_mesh.begin_active()->face(0)->set_boundary_id(1); volume_mesh.refine_global (1); save_mesh(volume_mesh); diff --git a/tests/codim_one/extract_boundary_mesh_03.cc b/tests/codim_one/extract_boundary_mesh_03.cc index 6b83ab99ca..1710031cdc 100644 --- a/tests/codim_one/extract_boundary_mesh_03.cc +++ b/tests/codim_one/extract_boundary_mesh_03.cc @@ -111,7 +111,7 @@ int main () cell != volume_mesh.end(); ++cell) for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->at_boundary(f)) - cell->face(f)->set_all_boundary_indicators (1); + cell->face(f)->set_all_boundary_ids (1); volume_mesh.set_boundary (1, boundary_description); volume_mesh.refine_global (1); diff --git a/tests/codim_one/extract_boundary_mesh_04.cc b/tests/codim_one/extract_boundary_mesh_04.cc index 1fafe60d78..de31b03334 100644 --- a/tests/codim_one/extract_boundary_mesh_04.cc +++ b/tests/codim_one/extract_boundary_mesh_04.cc @@ -111,7 +111,7 @@ int main () cell != volume_mesh.end(); ++cell) for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->at_boundary(f) && (cell->center()[dim-1]>0)) - cell->face(f)->set_all_boundary_indicators (1); + cell->face(f)->set_all_boundary_ids (1); volume_mesh.set_boundary (1, boundary_description); volume_mesh.set_boundary (0, boundary_description); diff --git a/tests/codim_one/hanging_nodes_01.cc b/tests/codim_one/hanging_nodes_01.cc index ec4aa77776..ca177b94b9 100644 --- a/tests/codim_one/hanging_nodes_01.cc +++ b/tests/codim_one/hanging_nodes_01.cc @@ -52,7 +52,7 @@ int main () Triangulation::active_cell_iterator cell = volume_mesh.begin_active(); - cell->face(0)->set_all_boundary_indicators (1); + cell->face(0)->set_all_boundary_ids (1); std::set boundary_ids; boundary_ids.insert(0); GridGenerator::extract_boundary_mesh (volume_mesh, boundary_mesh, boundary_ids); diff --git a/tests/codim_one/hanging_nodes_02.cc b/tests/codim_one/hanging_nodes_02.cc index 3288faf47c..a25a87cdf2 100644 --- a/tests/codim_one/hanging_nodes_02.cc +++ b/tests/codim_one/hanging_nodes_02.cc @@ -52,7 +52,7 @@ int main () Triangulation::active_cell_iterator cell = volume_mesh.begin_active(); - cell->face(0)->set_all_boundary_indicators (1); + cell->face(0)->set_all_boundary_ids (1); std::set boundary_ids; boundary_ids.insert(0); GridGenerator::extract_boundary_mesh (volume_mesh, boundary_mesh, boundary_ids); diff --git a/tests/codim_one/hanging_nodes_03.cc b/tests/codim_one/hanging_nodes_03.cc index b27974cdbb..4b36e799db 100644 --- a/tests/codim_one/hanging_nodes_03.cc +++ b/tests/codim_one/hanging_nodes_03.cc @@ -46,7 +46,7 @@ int main () Triangulation::active_cell_iterator cell = volume_mesh.begin_active(); - cell->face(0)->set_all_boundary_indicators (1); + cell->face(0)->set_all_boundary_ids (1); std::set boundary_ids; boundary_ids.insert(0); GridGenerator::extract_boundary_mesh (volume_mesh, boundary_mesh, boundary_ids); diff --git a/tests/codim_one/interpolate_boundary_values_02.cc b/tests/codim_one/interpolate_boundary_values_02.cc index b985272e1d..e0ad70c8ba 100644 --- a/tests/codim_one/interpolate_boundary_values_02.cc +++ b/tests/codim_one/interpolate_boundary_values_02.cc @@ -66,7 +66,7 @@ void test() cell = dof_handler.begin_active(); cell != dof_handler.end(); ++cell) for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->at_boundary(f) && - (cell->face(f)->boundary_indicator() == boundary_id)) + (cell->face(f)->boundary_id() == boundary_id)) for (unsigned int v=0; v::vertices_per_face; ++v) for (unsigned int i=0; i::faces_per_cell; ++f) if (cell->at_boundary(f) && - (cell->face(f)->boundary_indicator() == boundary_id)) + (cell->face(f)->boundary_id() == boundary_id)) for (unsigned int v=0; v::vertices_per_face; ++v) for (unsigned int i=0; i::faces_per_cell; ++f) if (cell->at_boundary(f) && - (cell->face(f)->boundary_indicator() == boundary_id)) + (cell->face(f)->boundary_id() == boundary_id)) for (unsigned int v=0; v::vertices_per_face; ++v) for (unsigned int i=0; i::faces_per_cell; ++f) if (cell->at_boundary(f) && - (cell->face(f)->boundary_indicator() == boundary_id)) + (cell->face(f)->boundary_id() == boundary_id)) for (unsigned int v=0; v::vertices_per_face; ++v) for (unsigned int i=0; i tria; GridGenerator::hyper_cube (tria); - tria.begin()->face(0)->set_boundary_indicator(1); + tria.begin()->face(0)->set_boundary_id(1); tria.refine_global(1); tria.begin_active()->set_refine_flag(); tria.execute_coarsening_and_refinement(); diff --git a/tests/deal.II/constraints_local_to_global_chunk.cc b/tests/deal.II/constraints_local_to_global_chunk.cc index 502f24b36a..7252a7dc6a 100644 --- a/tests/deal.II/constraints_local_to_global_chunk.cc +++ b/tests/deal.II/constraints_local_to_global_chunk.cc @@ -50,7 +50,7 @@ void test (unsigned int chunk_size) { Triangulation tria; GridGenerator::hyper_cube (tria); - tria.begin()->face(0)->set_boundary_indicator(1); + tria.begin()->face(0)->set_boundary_id(1); tria.refine_global(1); tria.begin_active()->set_refine_flag(); tria.execute_coarsening_and_refinement(); diff --git a/tests/deal.II/dof_test.cc b/tests/deal.II/dof_test.cc index 71e36fbc68..86861c94ae 100644 --- a/tests/deal.II/dof_test.cc +++ b/tests/deal.II/dof_test.cc @@ -119,7 +119,7 @@ CurvedLine::get_new_point_on_line (const typename Triangulation::line_ // id was invented after the above was // written, so we are not very strict // here with using these flags - && (line->boundary_indicator() == 1)) + && (line->boundary_id() == 1)) return middle; @@ -265,8 +265,8 @@ 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_boundary_id(1); + tria->begin_active()->face(5)->set_boundary_id(1); }; // set the boundary function diff --git a/tests/deal.II/grid_hyper_shell.cc b/tests/deal.II/grid_hyper_shell.cc index 13cb5caf7d..c095d8f3a4 100644 --- a/tests/deal.II/grid_hyper_shell.cc +++ b/tests/deal.II/grid_hyper_shell.cc @@ -55,7 +55,7 @@ void check (double r1, double r2, unsigned int n) for (unsigned int f=0; f::faces_per_cell; ++f) if (c->face(f)->at_boundary()) for (unsigned int e=0; e::lines_per_face; ++e) - c->face(f)->line(e)->set_boundary_indicator(0); + c->face(f)->line(e)->set_boundary_id(0); static const HyperShellBoundary boundary(center); tria.set_boundary(0, boundary); diff --git a/tests/deal.II/grid_hyper_shell_05.cc b/tests/deal.II/grid_hyper_shell_05.cc index 5277e6887d..1d7a49b70b 100644 --- a/tests/deal.II/grid_hyper_shell_05.cc +++ b/tests/deal.II/grid_hyper_shell_05.cc @@ -67,7 +67,7 @@ void check (const unsigned int n) cell != tria.end(); ++cell) for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->at_boundary(f)) - deallog << cell->face(f) << ' ' << (int)cell->face(f)->boundary_indicator() + deallog << cell->face(f) << ' ' << (int)cell->face(f)->boundary_id() << ' ' << cell->face(f)->center().norm() << std::endl; } diff --git a/tests/deal.II/grid_hyper_shell_06.cc b/tests/deal.II/grid_hyper_shell_06.cc index 7e7467f67e..05c2406166 100644 --- a/tests/deal.II/grid_hyper_shell_06.cc +++ b/tests/deal.II/grid_hyper_shell_06.cc @@ -52,9 +52,9 @@ void check (double r1, double r2, unsigned int n) for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->face(f)->at_boundary()) for (unsigned int l=0; l::lines_per_face; ++l) - AssertThrow (cell->face(f)->line(l)->boundary_indicator() + AssertThrow (cell->face(f)->line(l)->boundary_id() == - cell->face(f)->boundary_indicator(), + cell->face(f)->boundary_id(), ExcInternalError()); deallog << "OK" << std::endl; diff --git a/tests/deal.II/grid_out_03.cc b/tests/deal.II/grid_out_03.cc index 6284060a93..555ffd1aca 100644 --- a/tests/deal.II/grid_out_03.cc +++ b/tests/deal.II/grid_out_03.cc @@ -41,8 +41,8 @@ void test () { Triangulation tria; GridGenerator::hyper_cube (tria); - tria.begin_active()->line(0)->set_boundary_indicator(1); - tria.begin_active()->face(2*dim-1)->set_boundary_indicator(2); + tria.begin_active()->line(0)->set_boundary_id(1); + tria.begin_active()->face(2*dim-1)->set_boundary_id(2); GridOut grid_out; GridOutFlags::Ucd flags; diff --git a/tests/deal.II/grid_out_04.cc b/tests/deal.II/grid_out_04.cc index 7fc37adec6..5abb968cfd 100644 --- a/tests/deal.II/grid_out_04.cc +++ b/tests/deal.II/grid_out_04.cc @@ -41,8 +41,8 @@ void test () { Triangulation tria; GridGenerator::hyper_cube (tria); - tria.begin_active()->line(0)->set_boundary_indicator(1); - tria.begin_active()->face(2*dim-1)->set_boundary_indicator(2); + tria.begin_active()->line(0)->set_boundary_id(1); + tria.begin_active()->face(2*dim-1)->set_boundary_id(2); GridOut grid_out; GridOutFlags::Msh flags; diff --git a/tests/deal.II/grid_out_05.cc b/tests/deal.II/grid_out_05.cc index 6284060a93..555ffd1aca 100644 --- a/tests/deal.II/grid_out_05.cc +++ b/tests/deal.II/grid_out_05.cc @@ -41,8 +41,8 @@ void test () { Triangulation tria; GridGenerator::hyper_cube (tria); - tria.begin_active()->line(0)->set_boundary_indicator(1); - tria.begin_active()->face(2*dim-1)->set_boundary_indicator(2); + tria.begin_active()->line(0)->set_boundary_id(1); + tria.begin_active()->face(2*dim-1)->set_boundary_id(2); GridOut grid_out; GridOutFlags::Ucd flags; diff --git a/tests/deal.II/grid_test.cc b/tests/deal.II/grid_test.cc index ebff5d5880..272a1e4046 100644 --- a/tests/deal.II/grid_test.cc +++ b/tests/deal.II/grid_test.cc @@ -112,7 +112,7 @@ CurvedLine::get_new_point_on_line (const typename Triangulation::line_ // id was invented after the above was // written, so we are not very strict // here with using these flags - && (line->boundary_indicator() == 1)) + && (line->boundary_id() == 1)) return middle; @@ -221,8 +221,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_boundary_id(1); + tria.begin_active()->face(5)->set_boundary_id(1); }; diff --git a/tests/deal.II/grid_tools_05.cc b/tests/deal.II/grid_tools_05.cc index ac8d3d5769..1a48cc1e74 100644 --- a/tests/deal.II/grid_tools_05.cc +++ b/tests/deal.II/grid_tools_05.cc @@ -88,8 +88,8 @@ void generate_grid(Triangulation<2> &triangulation) if (cell_2->face(j)->center()(1) < -2.9) face_2 = cell_2->face(j); } - face_1->set_boundary_indicator(42); - face_2->set_boundary_indicator(42); + face_1->set_boundary_id(42); + face_2->set_boundary_id(42); triangulation.refine_global(1); } @@ -152,8 +152,8 @@ void generate_grid(Triangulation<3> &triangulation) if (cell_2->face(j)->center()(2) < -2.9) face_2 = cell_2->face(j); } - face_1->set_boundary_indicator(42); - face_2->set_boundary_indicator(42); + face_1->set_boundary_id(42); + face_2->set_boundary_id(42); triangulation.refine_global(1); } diff --git a/tests/deal.II/grid_tools_06.cc b/tests/deal.II/grid_tools_06.cc index 2a7f5beb16..9efca9c37a 100644 --- a/tests/deal.II/grid_tools_06.cc +++ b/tests/deal.II/grid_tools_06.cc @@ -94,8 +94,8 @@ void generate_grid(Triangulation<2> &triangulation, int orientation) if (cell_2->face(j)->center()(1) < -2.9) face_2 = cell_2->face(j); } - face_1->set_boundary_indicator(42); - face_2->set_boundary_indicator(43); + face_1->set_boundary_id(42); + face_2->set_boundary_id(43); triangulation.refine_global(1); } @@ -169,8 +169,8 @@ void generate_grid(Triangulation<3> &triangulation, int orientation) if (cell_2->face(j)->center()(2) < -2.9) face_2 = cell_2->face(j); } - face_1->set_boundary_indicator(42); - face_2->set_boundary_indicator(43); + face_1->set_boundary_id(42); + face_2->set_boundary_id(43); triangulation.refine_global(1); } diff --git a/tests/deal.II/grid_transform.cc b/tests/deal.II/grid_transform.cc index 08eeabaee7..b316f24515 100644 --- a/tests/deal.II/grid_transform.cc +++ b/tests/deal.II/grid_transform.cc @@ -90,7 +90,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_boundary_id(1); } else Assert(false, ExcInternalError()); diff --git a/tests/deal.II/grid_transform_coefficient.cc b/tests/deal.II/grid_transform_coefficient.cc index 4c72c8ccf8..0741f9f92a 100644 --- a/tests/deal.II/grid_transform_coefficient.cc +++ b/tests/deal.II/grid_transform_coefficient.cc @@ -100,7 +100,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_boundary_id(1); } else Assert(false, ExcInternalError()); diff --git a/tests/deal.II/interpolate_boundary_values_01.cc b/tests/deal.II/interpolate_boundary_values_01.cc index e014988066..d486ece3dc 100644 --- a/tests/deal.II/interpolate_boundary_values_01.cc +++ b/tests/deal.II/interpolate_boundary_values_01.cc @@ -151,15 +151,15 @@ void FindBug::dirichlet_conditions () std::vector fixed_dofs (dof_handler.n_dofs()); - std::set boundary_indicators; - boundary_indicators.insert (0); + std::set boundary_ids; + boundary_ids.insert (0); // get a list of those boundary DoFs which // we want to be fixed: DoFTools::extract_boundary_dofs (dof_handler, component_mask, fixed_dofs, - boundary_indicators); + boundary_ids); // (Primitive) Check if the DoFs // where adjusted correctly (note diff --git a/tests/deal.II/interpolate_boundary_values_02.cc b/tests/deal.II/interpolate_boundary_values_02.cc index 7c30ca6def..8ff8798045 100644 --- a/tests/deal.II/interpolate_boundary_values_02.cc +++ b/tests/deal.II/interpolate_boundary_values_02.cc @@ -51,8 +51,8 @@ void test () DoFHandler dof_handler(triangulation); GridGenerator::hyper_cube (triangulation, 0, 1); - triangulation.begin_active()->face(0)->set_boundary_indicator(10); - triangulation.begin_active()->face(1)->set_boundary_indicator(20); + triangulation.begin_active()->face(0)->set_boundary_id(10); + triangulation.begin_active()->face(1)->set_boundary_id(20); triangulation.refine_global (1); dof_handler.distribute_dofs (fe); diff --git a/tests/deal.II/kelly_crash_02.cc b/tests/deal.II/kelly_crash_02.cc index 188f65cdf6..197c54faa9 100644 --- a/tests/deal.II/kelly_crash_02.cc +++ b/tests/deal.II/kelly_crash_02.cc @@ -215,7 +215,7 @@ void test () (cell->face(f)->center()[2] != 7) && (cell->face(f)->at_boundary())) - cell->face(f)->set_boundary_indicator (1); + cell->face(f)->set_boundary_id (1); triangulation.refine_global (1); diff --git a/tests/deal.II/merge_triangulations_02.cc b/tests/deal.II/merge_triangulations_02.cc index a2ca153120..3b8f2b07ff 100644 --- a/tests/deal.II/merge_triangulations_02.cc +++ b/tests/deal.II/merge_triangulations_02.cc @@ -56,7 +56,7 @@ void mesh_info(const Triangulation &tria) for (unsigned int face=0; face::faces_per_cell; ++face) { if (cell->face(face)->at_boundary()) - boundary_count[cell->face(face)->boundary_indicator()]++; + boundary_count[cell->face(face)->boundary_id()]++; } } diff --git a/tests/deal.II/merge_triangulations_03.cc b/tests/deal.II/merge_triangulations_03.cc index 9b2e18e050..06d1ddfaa4 100644 --- a/tests/deal.II/merge_triangulations_03.cc +++ b/tests/deal.II/merge_triangulations_03.cc @@ -103,7 +103,7 @@ void mesh_info(const Triangulation &tria, ++face) { if (cell->face(face)->at_boundary()) - boundary_count[cell->face(face)->boundary_indicator()]++; + boundary_count[cell->face(face)->boundary_id()]++; } } deallog << " boundary indicators: "; diff --git a/tests/deal.II/no_flux_01.cc b/tests/deal.II/no_flux_01.cc index 1d3e208341..f5f499c9f7 100644 --- a/tests/deal.II/no_flux_01.cc +++ b/tests/deal.II/no_flux_01.cc @@ -67,7 +67,7 @@ void test_hyper_cube() GridGenerator::hyper_cube(tr); for (unsigned int i=0; i::faces_per_cell; ++i) - tr.begin_active()->face(i)->set_boundary_indicator (i); + tr.begin_active()->face(i)->set_boundary_id (i); tr.refine_global(2); diff --git a/tests/deal.II/no_flux_02.cc b/tests/deal.II/no_flux_02.cc index 179ddc274d..03cb2446f7 100644 --- a/tests/deal.II/no_flux_02.cc +++ b/tests/deal.II/no_flux_02.cc @@ -69,7 +69,7 @@ void test_hyper_cube() GridGenerator::hyper_cube(tr); for (unsigned int i=0; i::faces_per_cell; ++i) - tr.begin_active()->face(i)->set_boundary_indicator (i); + tr.begin_active()->face(i)->set_boundary_id (i); tr.refine_global(2); diff --git a/tests/deal.II/no_flux_10.cc b/tests/deal.II/no_flux_10.cc index 1f0dd56e7a..5c2fa91583 100644 --- a/tests/deal.II/no_flux_10.cc +++ b/tests/deal.II/no_flux_10.cc @@ -67,51 +67,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_boundary_id(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_boundary_id(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_boundary_id(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_boundary_id(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_boundary_id(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_boundary_id(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_boundary_id(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_boundary_id(5); } else if (radius < middle) // inner radius set boundary 0 { - cell->face(f)->set_boundary_indicator(0); + cell->face(f)->set_boundary_id(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_boundary_id(0); } else if (radius > middle) // outer radius set boundary 1 { - cell->face(f)->set_boundary_indicator(1); + cell->face(f)->set_boundary_id(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_boundary_id(1); } else AssertThrow (false, ExcInternalError()); @@ -189,7 +189,7 @@ void run() for (unsigned int f=0; f<6; ++f) deallog << "Face=" << f << ", boundary_id=" - << (int)triangulation.begin_active()->face(f)->boundary_indicator() << std::endl; + << (int)triangulation.begin_active()->face(f)->boundary_id() << std::endl; std::set no_normal_flux_boundaries; no_normal_flux_boundaries.insert (0); diff --git a/tests/deal.II/no_flux_11.cc b/tests/deal.II/no_flux_11.cc index 376192fd98..15873de6ab 100644 --- a/tests/deal.II/no_flux_11.cc +++ b/tests/deal.II/no_flux_11.cc @@ -65,25 +65,25 @@ void run() if ( (std::fabs(cell->face(face)->center()(0)) < 0.1) && (std::fabs(cell->face(face)->center()(dim-1)) < 1e-12) ) { - cell->face(face)->set_boundary_indicator (1); + cell->face(face)->set_boundary_id (1); } if ( (std::fabs(cell->face(face)->center()(0)) < 1e-12) && (std::fabs(cell->face(face)->center()(dim-1)) < 0.1) ) { - cell->face(face)->set_boundary_indicator (1); + cell->face(face)->set_boundary_id (1); } if ( (std::fabs(1.0-cell->face(face)->center()(0)) < 0.1) && (std::fabs(1.0-cell->face(face)->center()(dim-1)) < 1e-12) ) { - cell->face(face)->set_boundary_indicator (2); + cell->face(face)->set_boundary_id (2); } if ( (std::fabs(1.0-cell->face(face)->center()(0)) < 1e-12) && (std::fabs(1.0-cell->face(face)->center()(dim-1)) < 0.1) ) { - cell->face(face)->set_boundary_indicator (2); + cell->face(face)->set_boundary_id (2); } // no normal flux boundary @@ -91,25 +91,25 @@ void run() if ( (std::fabs(cell->face(face)->center()(0)) >= 0.1 && std::fabs(cell->face(face)->center()(0)) <= 1.0) && (std::fabs(cell->face(face)->center()(dim-1)) < 1e-12) ) { - cell->face(face)->set_boundary_indicator (3); + cell->face(face)->set_boundary_id (3); } if ( (std::fabs(cell->face(face)->center()(0)) >= 0.0 && std::fabs(cell->face(face)->center()(0)) <= 0.9) && (std::fabs(1.0-cell->face(face)->center()(dim-1)) < 1e-12) ) { - cell->face(face)->set_boundary_indicator (5); + cell->face(face)->set_boundary_id (5); } if ( (std::fabs(1.0-cell->face(face)->center()(0)) < 1e-12) && (std::fabs(cell->face(face)->center()(dim-1)) >= 0.0 && std::fabs(cell->face(face)->center()(dim-1)) <= 0.9) ) { - cell->face(face)->set_boundary_indicator (4); + cell->face(face)->set_boundary_id (4); } if ( (std::fabs(cell->face(face)->center()(0)) < 1e-12) && (std::fabs(cell->face(face)->center()(dim-1)) >= 0.1 && std::fabs(cell->face(face)->center()(dim-1)) <= 1.0) ) { - cell->face(face)->set_boundary_indicator (6); + cell->face(face)->set_boundary_id (6); } } } diff --git a/tests/deal.II/no_flux_13.cc b/tests/deal.II/no_flux_13.cc index b883f2db73..a0f695ee2e 100644 --- a/tests/deal.II/no_flux_13.cc +++ b/tests/deal.II/no_flux_13.cc @@ -36,7 +36,7 @@ void test() { Triangulation triangulation; GridGenerator::hyper_cube (triangulation,-1.0,1.0); - triangulation.begin_active()->face(1)->set_all_boundary_indicators(1); + triangulation.begin_active()->face(1)->set_all_boundary_ids(1); FE_Q fe(1); DoFHandler dof_handler(triangulation); diff --git a/tests/deal.II/no_flux_hp_01.cc b/tests/deal.II/no_flux_hp_01.cc index 82314a02ee..9f87c2a7b2 100644 --- a/tests/deal.II/no_flux_hp_01.cc +++ b/tests/deal.II/no_flux_hp_01.cc @@ -63,7 +63,7 @@ void test_hyper_cube() GridGenerator::hyper_cube(tr); for (unsigned int i=0; i::faces_per_cell; ++i) - tr.begin_active()->face(i)->set_boundary_indicator (i); + tr.begin_active()->face(i)->set_boundary_id (i); tr.refine_global(2); diff --git a/tests/deal.II/no_flux_hp_02.cc b/tests/deal.II/no_flux_hp_02.cc index 5391bfcfa8..83c8762544 100644 --- a/tests/deal.II/no_flux_hp_02.cc +++ b/tests/deal.II/no_flux_hp_02.cc @@ -65,7 +65,7 @@ void test_hyper_cube() GridGenerator::hyper_cube(tr); for (unsigned int i=0; i::faces_per_cell; ++i) - tr.begin_active()->face(i)->set_boundary_indicator (i); + tr.begin_active()->face(i)->set_boundary_id (i); tr.refine_global(2); diff --git a/tests/deal.II/normal_flux_01.cc b/tests/deal.II/normal_flux_01.cc index 38a8c70d10..45d1e325e0 100644 --- a/tests/deal.II/normal_flux_01.cc +++ b/tests/deal.II/normal_flux_01.cc @@ -67,7 +67,7 @@ void test_hyper_cube() GridGenerator::hyper_cube(tr); for (unsigned int i=0; i::faces_per_cell; ++i) - tr.begin_active()->face(i)->set_boundary_indicator (i); + tr.begin_active()->face(i)->set_boundary_id (i); tr.refine_global(2); diff --git a/tests/deal.II/normal_flux_02.cc b/tests/deal.II/normal_flux_02.cc index 1408647e08..9e51c7a43a 100644 --- a/tests/deal.II/normal_flux_02.cc +++ b/tests/deal.II/normal_flux_02.cc @@ -69,7 +69,7 @@ void test_hyper_cube() GridGenerator::hyper_cube(tr); for (unsigned int i=0; i::faces_per_cell; ++i) - tr.begin_active()->face(i)->set_boundary_indicator (i); + tr.begin_active()->face(i)->set_boundary_id (i); tr.refine_global(2); diff --git a/tests/deal.II/normal_flux_hp_01.cc b/tests/deal.II/normal_flux_hp_01.cc index 850d846906..1bbfd566db 100644 --- a/tests/deal.II/normal_flux_hp_01.cc +++ b/tests/deal.II/normal_flux_hp_01.cc @@ -66,7 +66,7 @@ void test_hyper_cube() GridGenerator::hyper_cube(tr); for (unsigned int i=0; i::faces_per_cell; ++i) - tr.begin_active()->face(i)->set_boundary_indicator (i); + tr.begin_active()->face(i)->set_boundary_id (i); tr.refine_global(2); diff --git a/tests/deal.II/normal_flux_inhom_01.cc b/tests/deal.II/normal_flux_inhom_01.cc index 56582ba1fc..e587816a64 100644 --- a/tests/deal.II/normal_flux_inhom_01.cc +++ b/tests/deal.II/normal_flux_inhom_01.cc @@ -103,7 +103,7 @@ void test_hyper_cube() GridGenerator::hyper_cube(tr); for (unsigned int i=0; i::faces_per_cell; ++i) - tr.begin_active()->face(i)->set_boundary_indicator (i); + tr.begin_active()->face(i)->set_boundary_id (i); tr.refine_global(2); diff --git a/tests/deal.II/tangential_flux_inhom_01.cc b/tests/deal.II/tangential_flux_inhom_01.cc index 88c691a132..62cf36fe43 100644 --- a/tests/deal.II/tangential_flux_inhom_01.cc +++ b/tests/deal.II/tangential_flux_inhom_01.cc @@ -102,7 +102,7 @@ void test_hyper_cube() GridGenerator::hyper_cube(tr); for (unsigned int i=0; i::faces_per_cell; ++i) - tr.begin_active()->face(i)->set_boundary_indicator (i); + tr.begin_active()->face(i)->set_boundary_id (i); tr.refine_global(2); diff --git a/tests/deal.II/vertex_as_face_04.cc b/tests/deal.II/vertex_as_face_04.cc index 3e8530e9c6..0abc0aed8d 100644 --- a/tests/deal.II/vertex_as_face_04.cc +++ b/tests/deal.II/vertex_as_face_04.cc @@ -34,8 +34,8 @@ void test () GridGenerator::hyper_cube (tria); deallog << "Coarse mesh:" << std::endl; - deallog << "Left vertex=" << (int)tria.begin_active()->face(0)->boundary_indicator() << std::endl; - deallog << "Right vertex=" << (int)tria.begin_active()->face(1)->boundary_indicator() << std::endl; + deallog << "Left vertex=" << (int)tria.begin_active()->face(0)->boundary_id() << std::endl; + deallog << "Right vertex=" << (int)tria.begin_active()->face(1)->boundary_id() << std::endl; tria.refine_global (2); @@ -44,8 +44,8 @@ void test () cell != tria.end(); ++cell) { deallog << "Cell: " << cell << std::endl; - deallog << "Left vertex=" << (int)cell->face(0)->boundary_indicator() << std::endl; - deallog << "Right vertex=" << (int)cell->face(1)->boundary_indicator() << std::endl; + deallog << "Left vertex=" << (int)cell->face(0)->boundary_id() << std::endl; + deallog << "Right vertex=" << (int)cell->face(1)->boundary_id() << std::endl; } } diff --git a/tests/deal.II/vertex_as_face_08.cc b/tests/deal.II/vertex_as_face_08.cc index 244017f88e..ab5c884f54 100644 --- a/tests/deal.II/vertex_as_face_08.cc +++ b/tests/deal.II/vertex_as_face_08.cc @@ -15,7 +15,7 @@ // verify that we can do things like cell->face() in 1d as well. here: -// Triangulation::get_boundary_indicators() +// Triangulation::get_boundary_ids() #include "../tests.h" @@ -35,7 +35,7 @@ void test () tria.refine_global (2); std::vector - boundary_ids = tria.get_boundary_indicators (); + boundary_ids = tria.get_boundary_ids (); for (unsigned int i=0; iface() in 1d as well. here: -// Triangulation::get_boundary_indicators() should return an empty vector when +// Triangulation::get_boundary_ids() should return an empty vector when // called to create a mesh that is a loop @@ -39,7 +39,7 @@ void test () GridGenerator::extract_boundary_mesh (volume_mesh, tria); deallog << "n_cells = " << tria.n_active_cells() << std::endl; - deallog << "n_boundary_ids = " << tria.get_boundary_indicators ().size() + deallog << "n_boundary_ids = " << tria.get_boundary_ids ().size() << std::endl; } diff --git a/tests/deal.II/vertex_as_face_10.cc b/tests/deal.II/vertex_as_face_10.cc index 129eaa69a5..ab7fc1c14c 100644 --- a/tests/deal.II/vertex_as_face_10.cc +++ b/tests/deal.II/vertex_as_face_10.cc @@ -33,11 +33,11 @@ void test () Triangulation<1,spacedim> tria; GridGenerator::hyper_cube (tria); - tria.begin_active()->face(0)->set_boundary_indicator(2); - tria.begin_active()->face(1)->set_boundary_indicator(4); + tria.begin_active()->face(0)->set_boundary_id(2); + tria.begin_active()->face(1)->set_boundary_id(4); std::vector - boundary_ids = tria.get_boundary_indicators (); + boundary_ids = tria.get_boundary_ids (); for (unsigned int i=0; i tria; GridGenerator::hyper_cube (tria); - tria.begin_active()->face(0)->set_boundary_indicator(2); - tria.begin_active()->face(1)->set_boundary_indicator(4); + tria.begin_active()->face(0)->set_boundary_id(2); + tria.begin_active()->face(1)->set_boundary_id(4); - deallog << (int)tria.begin_active()->face(0)->boundary_indicator() << std::endl; - deallog << (int)tria.begin_active()->face(1)->boundary_indicator() << std::endl; + deallog << (int)tria.begin_active()->face(0)->boundary_id() << std::endl; + deallog << (int)tria.begin_active()->face(1)->boundary_id() << std::endl; } diff --git a/tests/fail/circular_01.cc b/tests/fail/circular_01.cc index 0d78280b63..214ecfcc1c 100644 --- a/tests/fail/circular_01.cc +++ b/tests/fail/circular_01.cc @@ -817,7 +817,7 @@ void LaplaceProblem<3>::create_coarse_grid () (cell->face(f)->center()[2] != 7) && (cell->face(f)->at_boundary())) - cell->face(f)->set_boundary_indicator (1); + cell->face(f)->set_boundary_id (1); triangulation.refine_global (1); } diff --git a/tests/fe/cell_similarity_01.cc b/tests/fe/cell_similarity_01.cc index 0cd63f7faa..53544fc240 100644 --- a/tests/fe/cell_similarity_01.cc +++ b/tests/fe/cell_similarity_01.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_02.cc b/tests/fe/cell_similarity_02.cc index 43dc0e533e..182c2f937b 100644 --- a/tests/fe/cell_similarity_02.cc +++ b/tests/fe/cell_similarity_02.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_03.cc b/tests/fe/cell_similarity_03.cc index 40beaa555b..676cf1f0ae 100644 --- a/tests/fe/cell_similarity_03.cc +++ b/tests/fe/cell_similarity_03.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_04.cc b/tests/fe/cell_similarity_04.cc index f566244ca9..74e3135a04 100644 --- a/tests/fe/cell_similarity_04.cc +++ b/tests/fe/cell_similarity_04.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_05.cc b/tests/fe/cell_similarity_05.cc index aa9ab9ae6c..96df0e06cd 100644 --- a/tests/fe/cell_similarity_05.cc +++ b/tests/fe/cell_similarity_05.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_06.cc b/tests/fe/cell_similarity_06.cc index 5cf1ae5224..989f6a7dd2 100644 --- a/tests/fe/cell_similarity_06.cc +++ b/tests/fe/cell_similarity_06.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_07.cc b/tests/fe/cell_similarity_07.cc index 994f90643f..7416497b6c 100644 --- a/tests/fe/cell_similarity_07.cc +++ b/tests/fe/cell_similarity_07.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_08.cc b/tests/fe/cell_similarity_08.cc index c6f3685bda..f4bee06eb1 100644 --- a/tests/fe/cell_similarity_08.cc +++ b/tests/fe/cell_similarity_08.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_09.cc b/tests/fe/cell_similarity_09.cc index abdbbe6af5..c8cec0445c 100644 --- a/tests/fe/cell_similarity_09.cc +++ b/tests/fe/cell_similarity_09.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_10.cc b/tests/fe/cell_similarity_10.cc index f6d35d01ed..c1c8b5ac15 100644 --- a/tests/fe/cell_similarity_10.cc +++ b/tests/fe/cell_similarity_10.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_01.cc b/tests/fe/cell_similarity_dgp_monomial_01.cc index 74f7aec3e0..b35759d5bd 100644 --- a/tests/fe/cell_similarity_dgp_monomial_01.cc +++ b/tests/fe/cell_similarity_dgp_monomial_01.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_02.cc b/tests/fe/cell_similarity_dgp_monomial_02.cc index 308110e6f8..05cc886f9f 100644 --- a/tests/fe/cell_similarity_dgp_monomial_02.cc +++ b/tests/fe/cell_similarity_dgp_monomial_02.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_03.cc b/tests/fe/cell_similarity_dgp_monomial_03.cc index 307c391802..fb4bcfc08a 100644 --- a/tests/fe/cell_similarity_dgp_monomial_03.cc +++ b/tests/fe/cell_similarity_dgp_monomial_03.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_04.cc b/tests/fe/cell_similarity_dgp_monomial_04.cc index b2e0f22a49..0274c9983e 100644 --- a/tests/fe/cell_similarity_dgp_monomial_04.cc +++ b/tests/fe/cell_similarity_dgp_monomial_04.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_05.cc b/tests/fe/cell_similarity_dgp_monomial_05.cc index c15742af4d..f9d1bb6cc4 100644 --- a/tests/fe/cell_similarity_dgp_monomial_05.cc +++ b/tests/fe/cell_similarity_dgp_monomial_05.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_06.cc b/tests/fe/cell_similarity_dgp_monomial_06.cc index 30ea774ecd..993a34118b 100644 --- a/tests/fe/cell_similarity_dgp_monomial_06.cc +++ b/tests/fe/cell_similarity_dgp_monomial_06.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_07.cc b/tests/fe/cell_similarity_dgp_monomial_07.cc index e278d3805e..ad17cb0c7d 100644 --- a/tests/fe/cell_similarity_dgp_monomial_07.cc +++ b/tests/fe/cell_similarity_dgp_monomial_07.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_08.cc b/tests/fe/cell_similarity_dgp_monomial_08.cc index e372679b08..8e4cc3d0ec 100644 --- a/tests/fe/cell_similarity_dgp_monomial_08.cc +++ b/tests/fe/cell_similarity_dgp_monomial_08.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_09.cc b/tests/fe/cell_similarity_dgp_monomial_09.cc index ea67683875..662a65c43a 100644 --- a/tests/fe/cell_similarity_dgp_monomial_09.cc +++ b/tests/fe/cell_similarity_dgp_monomial_09.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_monomial_10.cc b/tests/fe/cell_similarity_dgp_monomial_10.cc index 79dbe2cbf3..3e6613463e 100644 --- a/tests/fe/cell_similarity_dgp_monomial_10.cc +++ b/tests/fe/cell_similarity_dgp_monomial_10.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_01.cc b/tests/fe/cell_similarity_dgp_nonparametric_01.cc index cb8f6b5bb5..27683a48c1 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_01.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_01.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_02.cc b/tests/fe/cell_similarity_dgp_nonparametric_02.cc index f8be8723e3..5382ca5582 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_02.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_02.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_03.cc b/tests/fe/cell_similarity_dgp_nonparametric_03.cc index 9bbb249eac..dfbedf25c5 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_03.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_03.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_04.cc b/tests/fe/cell_similarity_dgp_nonparametric_04.cc index 17ce614d69..add597f9d5 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_04.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_04.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_05.cc b/tests/fe/cell_similarity_dgp_nonparametric_05.cc index 9501c6f630..88d8b9dad9 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_05.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_05.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_06.cc b/tests/fe/cell_similarity_dgp_nonparametric_06.cc index 7525935a71..4e623a1920 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_06.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_06.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_07.cc b/tests/fe/cell_similarity_dgp_nonparametric_07.cc index 4eea77ea51..22146bc2f1 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_07.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_07.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_08.cc b/tests/fe/cell_similarity_dgp_nonparametric_08.cc index 8357a63e5c..424faef1af 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_08.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_08.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_09.cc b/tests/fe/cell_similarity_dgp_nonparametric_09.cc index 65a82aaaf4..e15ae2312b 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_09.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_09.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/cell_similarity_dgp_nonparametric_10.cc b/tests/fe/cell_similarity_dgp_nonparametric_10.cc index 8a380e0ba3..345bfffc8a 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_10.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_10.cc @@ -157,7 +157,7 @@ void test() // 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_boundary_id (1); test(tr); } diff --git a/tests/fe/mapping.cc b/tests/fe/mapping.cc index cb7bb67540..6f7d72bae1 100644 --- a/tests/fe/mapping.cc +++ b/tests/fe/mapping.cc @@ -307,8 +307,8 @@ void create_triangulations(std::vector *> &tria_ptr, 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->begin_active()->face(1)->set_boundary_id(1); + tria->begin_active()->face(3)->set_boundary_id(2); double pi=std::acos(-1.); double alpha=2*std::atan(0.5); exact_areas.push_back(4+pi-2.5*(alpha-std::sin(alpha))); @@ -346,7 +346,7 @@ void create_triangulations(std::vector *> &tria_ptr, v3(0) = 0.5; v3(1) = 1.5; tria->set_boundary(1,*boundary1); - tria->begin_active()->face(1)->set_boundary_indicator(1); + tria->begin_active()->face(1)->set_boundary_id(1); exact_areas.push_back(0.); for (unsigned int i=0; i<=4; ++i) show[4][i]=1; @@ -401,7 +401,7 @@ void create_triangulations(std::vector *> &tria_ptr, 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->begin_active()->face(1)->set_boundary_id(1); exact_areas.push_back(8.+pi/3*h*h*(3*r-h)); } diff --git a/tests/fe/mapping_fe_real_to_unit_q5_curved.cc b/tests/fe/mapping_fe_real_to_unit_q5_curved.cc index 7589c58dd0..1de8780b31 100644 --- a/tests/fe/mapping_fe_real_to_unit_q5_curved.cc +++ b/tests/fe/mapping_fe_real_to_unit_q5_curved.cc @@ -60,7 +60,7 @@ 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.begin_active()->face(0)->set_boundary_id (1); const unsigned int n_points = 5; diff --git a/tests/fe/mapping_real_to_unit_q4_curved.cc b/tests/fe/mapping_real_to_unit_q4_curved.cc index c2c0edf102..49d1aedfb8 100644 --- a/tests/fe/mapping_real_to_unit_q4_curved.cc +++ b/tests/fe/mapping_real_to_unit_q4_curved.cc @@ -50,7 +50,7 @@ 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.begin_active()->face(0)->set_boundary_id (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 d3f7159d08..fb00db604b 100644 --- a/tests/fe/mapping_real_to_unit_q4_curved_codim.cc +++ b/tests/fe/mapping_real_to_unit_q4_curved_codim.cc @@ -50,7 +50,7 @@ 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.begin_active()->face(0)->set_boundary_id (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 2a44de7cc8..a765e1a72f 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere.cc @@ -79,7 +79,7 @@ void test_real_to_unit_cell() // one face and adjacent edges of // the single cell triangulation.set_boundary (1, boundary); - triangulation.begin_active()->face(5)->set_all_boundary_indicators (1); + triangulation.begin_active()->face(5)->set_all_boundary_ids (1); // now try to find the coordinates // of the following point in the 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 f91ce956b5..a615f1b692 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere_x.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere_x.cc @@ -69,7 +69,7 @@ void test_real_to_unit_cell() // one face and adjacent edges of // the single cell triangulation.set_boundary (1, boundary); - triangulation.begin_active()->face(5)->set_all_boundary_indicators (1); + triangulation.begin_active()->face(5)->set_all_boundary_ids (1); // now try to find the coordinates // of the following point in the 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 d9687a4a4e..7f2826630a 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere_y.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere_y.cc @@ -69,7 +69,7 @@ void test_real_to_unit_cell() // one face and adjacent edges of // the single cell triangulation.set_boundary (1, boundary); - triangulation.begin_active()->face(5)->set_all_boundary_indicators (1); + triangulation.begin_active()->face(5)->set_all_boundary_ids (1); // now try to find the coordinates // of the following point in the 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 e5434323c1..281efb6fc3 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere_z.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere_z.cc @@ -69,7 +69,7 @@ void test_real_to_unit_cell() // one face and adjacent edges of // the single cell triangulation.set_boundary (1, boundary); - triangulation.begin_active()->face(5)->set_all_boundary_indicators (1); + triangulation.begin_active()->face(5)->set_all_boundary_ids (1); // now see if the point is inside // or outside diff --git a/tests/hp/create_rhs_01.cc b/tests/hp/create_rhs_01.cc index 8dcc945aa9..9860ff538e 100644 --- a/tests/hp/create_rhs_01.cc +++ b/tests/hp/create_rhs_01.cc @@ -76,7 +76,7 @@ void test () Vector rhs_vector2(hp_dof_handler2.n_dofs()); types::boundary_id myints[1] = {0}; - std::set boundary_indicators (myints,myints+1); + std::set boundary_ids (myints,myints+1); myints[0]=0; hp::QCollection<1> quadrature; quadrature.push_back (QGauss<1>(1)); @@ -93,7 +93,7 @@ void test () quadrature, rhs_function, rhs_vector2, - boundary_indicators); + boundary_ids); Assert (std::fabs (std::accumulate (rhs_vector2.begin(), rhs_vector2.end(), 0.) - 4) < 1e-12, @@ -104,7 +104,7 @@ void test () quadrature, rhs_function, rhs_vector, - boundary_indicators); + boundary_ids); Assert (std::fabs (std::accumulate (rhs_vector.begin(), rhs_vector.end(), 0.) - 4) < 1e-12, diff --git a/tests/hp/fe_nothing_18.cc b/tests/hp/fe_nothing_18.cc index d6511443e6..9c03b90df5 100644 --- a/tests/hp/fe_nothing_18.cc +++ b/tests/hp/fe_nothing_18.cc @@ -269,8 +269,8 @@ void ElasticProblem::make_grid () triangulationR.begin_active()->set_material_id(id_of_lagrange_mult); for (unsigned int i=0;iface(i)->set_boundary_indicator(i); - triangulationR.begin_active()->face(i)->set_boundary_indicator(n_faces_per_cell+i); + triangulationL.begin_active()->face(i)->set_boundary_id(i); + triangulationR.begin_active()->face(i)->set_boundary_id(n_faces_per_cell+i); } GridGenerator::merge_triangulations (triangulationL, triangulationR, triangulation); diff --git a/tests/hp/step-7.cc b/tests/hp/step-7.cc index 4354841b28..21df29fb9f 100644 --- a/tests/hp/step-7.cc +++ b/tests/hp/step-7.cc @@ -327,7 +327,7 @@ void HelmholtzProblem::assemble_system () for (unsigned int face=0; face::faces_per_cell; ++face) if (cell->face(face)->at_boundary() && - (cell->face(face)->boundary_indicator() == 1)) + (cell->face(face)->boundary_id() == 1)) { x_fe_face_values.reinit (cell, face); const FEFaceValues &fe_face_values @@ -503,7 +503,7 @@ void HelmholtzProblem::run () if ((cell->face(face)->center()(0) == -1) || (cell->face(face)->center()(1) == -1)) - cell->face(face)->set_boundary_indicator (1); + cell->face(face)->set_boundary_id (1); } else refine_grid (); diff --git a/tests/integrators/mesh_worker_1d_dg.cc b/tests/integrators/mesh_worker_1d_dg.cc index e253cc3d04..e3ae0a652c 100644 --- a/tests/integrators/mesh_worker_1d_dg.cc +++ b/tests/integrators/mesh_worker_1d_dg.cc @@ -305,7 +305,7 @@ namespace Advection void AdvectionProblem::integrate_boundary_term (MeshWorker::DoFInfo &dinfo, MeshWorker::IntegrationInfo &info) { - const unsigned int boundary_id = dinfo.face->boundary_indicator(); + const unsigned int boundary_id = dinfo.face->boundary_id(); // We only have a non-zero boundary contribution at the // x=0 boundary diff --git a/tests/manifold/copy_boundary_to_manifold_id_01.cc b/tests/manifold/copy_boundary_to_manifold_id_01.cc index 92c746dd34..6d119929ba 100644 --- a/tests/manifold/copy_boundary_to_manifold_id_01.cc +++ b/tests/manifold/copy_boundary_to_manifold_id_01.cc @@ -35,7 +35,7 @@ void print_info(Triangulation &tria) { if(cell->face(f)->at_boundary()) deallog << "face: " << cell->face(f) << ", boundary_id: " - << (int)cell->face(f)->boundary_indicator() + << (int)cell->face(f)->boundary_id() << ", manifold_id: " << (int)cell->face(f)->manifold_id() << std::endl; } diff --git a/tests/manifold/copy_material_to_manifold_id_01.cc b/tests/manifold/copy_material_to_manifold_id_01.cc index 8be4dbb560..4427f49f7b 100644 --- a/tests/manifold/copy_material_to_manifold_id_01.cc +++ b/tests/manifold/copy_material_to_manifold_id_01.cc @@ -40,7 +40,7 @@ void print_info(Triangulation &tria) { for (unsigned int f=0; f::faces_per_cell; ++f) deallog << "face: " << cell->face(f) << ", boundary_id: " - << (int)cell->face(f)->boundary_indicator() + << (int)cell->face(f)->boundary_id() << ", manifold_id: " << (int)cell->face(f)->manifold_id() << std::endl; } diff --git a/tests/manifold/set_all_manifold_ids_01.cc b/tests/manifold/set_all_manifold_ids_01.cc index af554f6837..2b8c457835 100644 --- a/tests/manifold/set_all_manifold_ids_01.cc +++ b/tests/manifold/set_all_manifold_ids_01.cc @@ -38,7 +38,7 @@ void print_info(Triangulation &tria) { for (unsigned int f=0; f::faces_per_cell; ++f) deallog << "face: " << cell->face(f) << ", boundary_id: " - << (int)cell->face(f)->boundary_indicator() + << (int)cell->face(f)->boundary_id() << ", manifold_id: " << (int)cell->face(f)->manifold_id() << std::endl; } diff --git a/tests/manifold/set_all_manifold_ids_02.cc b/tests/manifold/set_all_manifold_ids_02.cc index 80259c0e47..d651922c5a 100644 --- a/tests/manifold/set_all_manifold_ids_02.cc +++ b/tests/manifold/set_all_manifold_ids_02.cc @@ -38,7 +38,7 @@ void print_info(Triangulation &tria) { for (unsigned int f=0; f::faces_per_cell; ++f) deallog << "face: " << cell->face(f) << ", boundary_id: " - << (int)cell->face(f)->boundary_indicator() + << (int)cell->face(f)->boundary_id() << ", manifold_id: " << (int)cell->face(f)->manifold_id() << std::endl; } diff --git a/tests/serialization/dof_handler_01.cc b/tests/serialization/dof_handler_01.cc index d734b54814..d2d3c9b284 100644 --- a/tests/serialization/dof_handler_01.cc +++ b/tests/serialization/dof_handler_01.cc @@ -55,8 +55,8 @@ namespace dealii if (c1->face(f)->at_boundary()) { - if (c1->face(f)->boundary_indicator() != - c2->face(f)->boundary_indicator()) + if (c1->face(f)->boundary_id() != + c2->face(f)->boundary_id()) return false; } else @@ -136,7 +136,7 @@ void do_boundary (Triangulation &t1) for (; c1 != t1.end(); ++c1) for (unsigned int f=0; f::faces_per_cell; ++f) if (c1->at_boundary(f)) - c1->face(f)->set_boundary_indicator (42); + c1->face(f)->set_boundary_id (42); } diff --git a/tests/serialization/triangulation_01.cc b/tests/serialization/triangulation_01.cc index b06df18e82..6d4f099a50 100644 --- a/tests/serialization/triangulation_01.cc +++ b/tests/serialization/triangulation_01.cc @@ -62,8 +62,8 @@ namespace dealii if (c1->face(f)->at_boundary()) { - if (c1->face(f)->boundary_indicator() != - c2->face(f)->boundary_indicator()) + if (c1->face(f)->boundary_id() != + c2->face(f)->boundary_id()) return false; } else @@ -121,7 +121,7 @@ void do_boundary (Triangulation &t1) for (; c1 != t1.end(); ++c1) for (unsigned int f=0; f::faces_per_cell; ++f) if (c1->at_boundary(f)) { - c1->face(f)->set_boundary_indicator (42); + c1->face(f)->set_boundary_id (42); // c1->face(f)->set_manifold_id (43); } } diff --git a/tests/serialization/triangulation_02.cc b/tests/serialization/triangulation_02.cc index f7e5cdfe90..b0b4ce1cf1 100644 --- a/tests/serialization/triangulation_02.cc +++ b/tests/serialization/triangulation_02.cc @@ -64,8 +64,8 @@ namespace dealii if (c1->face(f)->at_boundary()) { - if (c1->face(f)->boundary_indicator() != - c2->face(f)->boundary_indicator()) + if (c1->face(f)->boundary_id() != + c2->face(f)->boundary_id()) return false; } else @@ -123,7 +123,7 @@ void do_boundary (Triangulation &t1) for (; c1 != t1.end(); ++c1) for (unsigned int f=0; f::faces_per_cell; ++f) if (c1->at_boundary(f)) - c1->face(f)->set_boundary_indicator (42); + c1->face(f)->set_boundary_id (42); }