]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Adjust tests: Use the non-deprecated version *_boundary_id() instead of *_boundary_in...
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Sat, 11 Apr 2015 23:27:12 +0000 (18:27 -0500)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Sun, 12 Apr 2015 16:30:46 +0000 (11:30 -0500)
119 files changed:
tests/benchmarks/step-22/step-22.cc
tests/benchmarks/test_assembly/step-22.cc
tests/bits/anna_4.cc
tests/bits/anna_6.cc
tests/bits/cylinder.cc
tests/bits/distorted_cells_03.cc
tests/bits/distorted_cells_04.cc
tests/bits/distorted_cells_05.cc
tests/bits/distorted_cells_06.cc
tests/bits/dof_tools_21_b.cc
tests/bits/dof_tools_21_b_x.cc
tests/bits/dof_tools_21_b_x_q3.cc
tests/bits/dof_tools_21_b_y.cc
tests/bits/dof_tools_21_c.cc
tests/bits/dof_tools_common.h
tests/bits/get_boundary_indicators_1d.cc
tests/bits/hyper_ball_3d.cc
tests/bits/periodicity_05.cc
tests/bits/static_condensation.cc
tests/bits/step-51.cc
tests/bits/step-51p.cc
tests/bits/step-7.cc
tests/codim_one/boundary_indicator_01.cc
tests/codim_one/extract_boundary_mesh_00.cc
tests/codim_one/extract_boundary_mesh_03.cc
tests/codim_one/extract_boundary_mesh_04.cc
tests/codim_one/hanging_nodes_01.cc
tests/codim_one/hanging_nodes_02.cc
tests/codim_one/hanging_nodes_03.cc
tests/codim_one/interpolate_boundary_values_02.cc
tests/codim_one/interpolate_boundary_values_02_vector_valued.cc
tests/codim_one/interpolate_boundary_values_03.cc
tests/codim_one/interpolate_boundary_values_1d_closed_ring.cc
tests/deal.II/constraints_local_to_global.cc
tests/deal.II/constraints_local_to_global_chunk.cc
tests/deal.II/dof_test.cc
tests/deal.II/grid_hyper_shell.cc
tests/deal.II/grid_hyper_shell_05.cc
tests/deal.II/grid_hyper_shell_06.cc
tests/deal.II/grid_out_03.cc
tests/deal.II/grid_out_04.cc
tests/deal.II/grid_out_05.cc
tests/deal.II/grid_test.cc
tests/deal.II/grid_tools_05.cc
tests/deal.II/grid_tools_06.cc
tests/deal.II/grid_transform.cc
tests/deal.II/grid_transform_coefficient.cc
tests/deal.II/interpolate_boundary_values_01.cc
tests/deal.II/interpolate_boundary_values_02.cc
tests/deal.II/kelly_crash_02.cc
tests/deal.II/merge_triangulations_02.cc
tests/deal.II/merge_triangulations_03.cc
tests/deal.II/no_flux_01.cc
tests/deal.II/no_flux_02.cc
tests/deal.II/no_flux_10.cc
tests/deal.II/no_flux_11.cc
tests/deal.II/no_flux_13.cc
tests/deal.II/no_flux_hp_01.cc
tests/deal.II/no_flux_hp_02.cc
tests/deal.II/normal_flux_01.cc
tests/deal.II/normal_flux_02.cc
tests/deal.II/normal_flux_hp_01.cc
tests/deal.II/normal_flux_inhom_01.cc
tests/deal.II/tangential_flux_inhom_01.cc
tests/deal.II/vertex_as_face_04.cc
tests/deal.II/vertex_as_face_08.cc
tests/deal.II/vertex_as_face_09.cc
tests/deal.II/vertex_as_face_10.cc
tests/deal.II/vertex_as_face_11.cc
tests/fail/circular_01.cc
tests/fe/cell_similarity_01.cc
tests/fe/cell_similarity_02.cc
tests/fe/cell_similarity_03.cc
tests/fe/cell_similarity_04.cc
tests/fe/cell_similarity_05.cc
tests/fe/cell_similarity_06.cc
tests/fe/cell_similarity_07.cc
tests/fe/cell_similarity_08.cc
tests/fe/cell_similarity_09.cc
tests/fe/cell_similarity_10.cc
tests/fe/cell_similarity_dgp_monomial_01.cc
tests/fe/cell_similarity_dgp_monomial_02.cc
tests/fe/cell_similarity_dgp_monomial_03.cc
tests/fe/cell_similarity_dgp_monomial_04.cc
tests/fe/cell_similarity_dgp_monomial_05.cc
tests/fe/cell_similarity_dgp_monomial_06.cc
tests/fe/cell_similarity_dgp_monomial_07.cc
tests/fe/cell_similarity_dgp_monomial_08.cc
tests/fe/cell_similarity_dgp_monomial_09.cc
tests/fe/cell_similarity_dgp_monomial_10.cc
tests/fe/cell_similarity_dgp_nonparametric_01.cc
tests/fe/cell_similarity_dgp_nonparametric_02.cc
tests/fe/cell_similarity_dgp_nonparametric_03.cc
tests/fe/cell_similarity_dgp_nonparametric_04.cc
tests/fe/cell_similarity_dgp_nonparametric_05.cc
tests/fe/cell_similarity_dgp_nonparametric_06.cc
tests/fe/cell_similarity_dgp_nonparametric_07.cc
tests/fe/cell_similarity_dgp_nonparametric_08.cc
tests/fe/cell_similarity_dgp_nonparametric_09.cc
tests/fe/cell_similarity_dgp_nonparametric_10.cc
tests/fe/mapping.cc
tests/fe/mapping_fe_real_to_unit_q5_curved.cc
tests/fe/mapping_real_to_unit_q4_curved.cc
tests/fe/mapping_real_to_unit_q4_curved_codim.cc
tests/fe/mapping_real_to_unit_q4_sphere.cc
tests/fe/mapping_real_to_unit_q4_sphere_x.cc
tests/fe/mapping_real_to_unit_q4_sphere_y.cc
tests/fe/mapping_real_to_unit_q4_sphere_z.cc
tests/hp/create_rhs_01.cc
tests/hp/fe_nothing_18.cc
tests/hp/step-7.cc
tests/integrators/mesh_worker_1d_dg.cc
tests/manifold/copy_boundary_to_manifold_id_01.cc
tests/manifold/copy_material_to_manifold_id_01.cc
tests/manifold/set_all_manifold_ids_01.cc
tests/manifold/set_all_manifold_ids_02.cc
tests/serialization/dof_handler_01.cc
tests/serialization/triangulation_01.cc
tests/serialization/triangulation_02.cc

index 613f0a3ecd361faf73975db06cd0481a933ac441..ba2a28c82a2803d35d3ca95cb672ba50f020392e 100644 (file)
@@ -1287,7 +1287,7 @@ namespace Step22
          cell != triangulation.end(); ++cell)
       for (unsigned int f=0; f<GeometryInfo<dim>::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
index 3f0248e5be8cebbdf85947e64210043a6f19e934..97d0c8629db99d636f5207a9021db8c6c156893f 100644 (file)
@@ -1266,7 +1266,7 @@ namespace Step22
          cell != triangulation.end(); ++cell)
       for (unsigned int f=0; f<GeometryInfo<dim>::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
index 6bfe6cc76808a7611126f1538fbcbfc61ea66fb3..b4486345d1bc89a26c58b57b4ebd97b8afade217 100644 (file)
@@ -190,15 +190,15 @@ void FindBug<dim>::dirichlet_conditions ()
 
 
   std::vector<bool> fixed_dofs (dof_handler.n_dofs());
-  std::set<types::boundary_id> boundary_indicators;
-  boundary_indicators.insert (0);
+  std::set<types::boundary_id> 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
index 82ebf4635cdbcd4f6edf18d9de79fd11bba5f4d7..0ef3d136f4683cdb3363452defb4a3787e5ffd07 100644 (file)
@@ -186,12 +186,12 @@ void ImposeBC<dim>::test_extract_boundary_DoFs ()
   bc_component_select[2] = false;
 
   std::vector<bool> ned_boundary_dofs (dof_handler.n_dofs());
-  std::set<types::boundary_id> boundary_indicators;
-  boundary_indicators.insert (0);
+  std::set<types::boundary_id> 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<dof_handler.n_dofs(); ++i)
@@ -225,12 +225,12 @@ void ImposeBC<dim>::test_interpolate_BC ()
   // (the pressure is assumed to be set to 1
   // on the boundary)
   std::vector<bool> p_boundary_dofs (dof_handler.n_dofs());
-  std::set<types::boundary_id> boundary_indicators;
-  boundary_indicators.insert (0);
+  std::set<types::boundary_id> 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; i<dof_handler.n_dofs(); ++i)
     {
       // error: pressure boundary DoF
index c33bbfa1ee816d592cbaef6636db372e320ab010..786c1c845225c42b52612075c13721eea8b13656 100644 (file)
@@ -53,7 +53,7 @@ int main ()
        face!=tria.end_face(); ++face)
     {
       deallog << face << "   "
-              << (int)face->boundary_indicator() << "  "
+              << (int)face->boundary_id() << "  "
               << '<' << face->vertex(0) << '>' << std::endl
               << "           <" << face->vertex(1) << '>' << std::endl
               << "           <" << face->vertex(2) << '>' << std::endl
index 39dce277e744fb45de29f20f5185c2554462ca97..7edbcf70de17f5f3b5490780af0fdbb86efd1d03 100644 (file)
@@ -85,7 +85,7 @@ void check ()
   // set bottom face to use MyBoundary
   for (unsigned int f=0; f<GeometryInfo<dim>::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
index 76aa7a16fb578b759ab35d252ec5c8b8c4e4e555..ed1c51d24068f09e07d2c61d7ecfccd35f430712 100644 (file)
@@ -118,7 +118,7 @@ void check ()
   // set bottom face to use MyBoundary
   for (unsigned int f=0; f<GeometryInfo<dim>::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
index 9467a3692778572d1f5268c2ca4e0c0746528a53..16bac1f512f970f8c29066fc5e0de5b837641b67 100644 (file)
@@ -120,7 +120,7 @@ void check ()
   // set bottom face to use MyBoundary
   for (unsigned int f=0; f<GeometryInfo<dim>::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
index 06de6773567e6e7e7eae43ed2f904d9df52b284b..e6d8153dffb3f5e8db220b942225bb3ced6a8e2d 100644 (file)
@@ -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
index d0960d19f24179e9bc8b3e213c83872386b14ba0..c3016e253e62656c374c9e6dc0c6beaffb4e0ca7 100644 (file)
@@ -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);
 }
index 3010141ad8eb1435ce887b1a4e073a5843bee2c2..4fd157eb4bf62d0857509fc2aaf0e1c2f649cd8a 100644 (file)
@@ -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);
 }
 
 
index 991a9755de9c8db11abf8b8f59f481c89a0fb670..cca2f2c94cdc4b3f22fde1f2c2c81cd356989280 100644 (file)
@@ -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);
 }
 
 
index eddba0559f3586820b5ef59d8ad2adbe9e4a63d7..3d8ecf9eb3873bba8d85a6cc652d78b0a3670b89 100644 (file)
@@ -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);
 }
 
 
index 47730d34ecffad9442dec9d8757840a691264e7e..d3f2fb78461adf96a2d3c5ec1a078fa904aaddd6 100644 (file)
@@ -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();
index cf27bbe4c351ec65ac68311d4d54325d8c43ade6..8f498fe5ae3500d8883c846d07f5ac36f98b2241 100644 (file)
@@ -62,7 +62,7 @@ void
 set_boundary_ids (Triangulation<dim> &tria)
 {
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
-    tria.begin_active()->face(f)->set_boundary_indicator (f);
+    tria.begin_active()->face(f)->set_boundary_id (f);
 }
 
 
index 670cded373b3ad14746252a7957abffc4d046b60..1265d1672194bab7b3c4506923be378d48fb1cbe 100644 (file)
@@ -19,7 +19,7 @@
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/grid_generator.h>
 
-// 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<types::boundary_id> indicators = triangulation.get_boundary_indicators();
+  const std::vector<types::boundary_id> indicators = triangulation.get_boundary_ids();
   for (unsigned int i=0; i<indicators.size(); ++i)
     deallog << int (indicators[i]) << std::endl;
 
index d8c4dabe2033b1910d38c8981ee380a9d8e13e97..26ac88437ceffcda8c7412e16fe4da35f6342ebd 100644 (file)
@@ -57,7 +57,7 @@ int main ()
        face!=tria.end_face(); ++face)
     {
       deallog << face << "   "
-              << (int)face->boundary_indicator() << "  "
+              << (int)face->boundary_id() << "  "
               << face->vertex_index(0)
               << " <" << face->vertex(0) << '>'
               << std::endl
index 17bb166a419213b34e0ded0c99783d5e73706622..3e06f0cee90ed7fd36ca4e6a92c288eefd909cd9 100644 (file)
@@ -133,10 +133,10 @@ void Deal2PeriodicBug::makeGrid()
   deallog<< "Constructing the grid..." <<std::endl;
   const Point<2> 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();
index 14ffae21d548aa40482f4d66c3f2b1887d2b37b5..56b3dfb96dd0e0034aab452b44a96acb5b5c91b0 100644 (file)
@@ -388,7 +388,7 @@ void HelmholtzProblem<dim>::assemble_system (const bool do_reconstruct)
       for (unsigned int face=0; face<GeometryInfo<dim>::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<dim> &fe_face_values
@@ -627,7 +627,7 @@ void HelmholtzProblem<dim>::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 ();
index 78682b09e996f2ca157b08d842cf4fb6a5ca7842..2ae285dd6581037f3486cf8bf79621d3d205bdaf 100644 (file)
@@ -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; d<dim; ++d)
             if ((std::fabs(cell->face(face)->center()(d) - (1)) < 1e-12))
-              cell->face(face)->set_boundary_indicator (1);
+              cell->face(face)->set_boundary_id (1);
   }
 
 
index 969634544ab8c1d948c94ddcee8258e8aa6bba1e..11b39616ace720cea69a7c8b7687f5ed26001bb6 100644 (file)
@@ -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; d<dim; ++d)
             if ((std::fabs(cell->face(face)->center()(d) - (1)) < 1e-12))
-              cell->face(face)->set_boundary_indicator (1);
+              cell->face(face)->set_boundary_id (1);
   }
 
 
index b3dcb08f0fe8a5643e756ba2d7e81d7d5da5770a..f4dbc3fbbd1d2b8576edbbc86317d8e1cb16396a 100644 (file)
@@ -328,7 +328,7 @@ void HelmholtzProblem<dim>::assemble_system ()
       for (unsigned int face=0; face<GeometryInfo<dim>::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<dim> &fe_face_values
@@ -504,7 +504,7 @@ void HelmholtzProblem<dim>::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 ();
index ee77169888cea8b15ac47f80fefaa877b3c0cb09..dc66180e7ac7069e8670ac6a81c3966550bd3a81 100644 (file)
 
 // 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<GeometryInfo<dim>::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<types::boundary_id> boundary_indicators;
-    boundary_indicators.insert (0);
+    std::set<types::boundary_id> 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<GeometryInfo<dim-1>::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);
 
index 83d648425a6c4d5f7812ee4e1e0ab1534f17c264..0951db108b2809bd41ab2fcc944a97924db943c0 100644 (file)
@@ -104,7 +104,7 @@ int main ()
 
     Triangulation<dim> 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<dim> 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<dim> 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);
index 6b83ab99ca3d679b128a47bae2c900f81147b9ad..1710031cdc61e1d8f2de31ed2204a940a132ed0f 100644 (file)
@@ -111,7 +111,7 @@ int main ()
          cell != volume_mesh.end(); ++cell)
       for (unsigned int f=0; f<GeometryInfo<dim>::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);
 
index 1fafe60d781b20ece7a948e80efa02d20aa89007..de31b0333462b7420ec99f1dad20aba132ac8db8 100644 (file)
@@ -111,7 +111,7 @@ int main ()
          cell != volume_mesh.end(); ++cell)
       for (unsigned int f=0; f<GeometryInfo<dim>::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);
index ec4aa77776c00ec26c36c316f6a92b97bb95d992..ca177b94b987f8e1e967c828132b5a8f51ccb5a1 100644 (file)
@@ -52,7 +52,7 @@ int main ()
     Triangulation<spacedim>::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<types::boundary_id> boundary_ids;
     boundary_ids.insert(0);
     GridGenerator::extract_boundary_mesh (volume_mesh, boundary_mesh, boundary_ids);
index 3288faf47c94f930c126b3023e84c9568702844d..a25a87cdf2dc0f93349183365e0f5209657ad976 100644 (file)
@@ -52,7 +52,7 @@ int main ()
     Triangulation<spacedim>::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<types::boundary_id> boundary_ids;
     boundary_ids.insert(0);
     GridGenerator::extract_boundary_mesh (volume_mesh, boundary_mesh, boundary_ids);
index b27974cdbbdf6866093ff5a48238642d655d4b4f..4b36e799db02b3182b2a9955966c3e1830921220 100644 (file)
@@ -46,7 +46,7 @@ int main ()
     Triangulation<spacedim>::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<types::boundary_id> boundary_ids;
     boundary_ids.insert(0);
     GridGenerator::extract_boundary_mesh (volume_mesh, boundary_mesh, boundary_ids);
index b985272e1d20558c909cc7673f9cdfa633a4b7c1..e0ad70c8bad05f9754f289907859dbcfe453934e 100644 (file)
@@ -66,7 +66,7 @@ void test()
            cell = dof_handler.begin_active(); cell != dof_handler.end(); ++cell)
         for (unsigned int f=0; f<GeometryInfo<dim>::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<GeometryInfo<dim>::vertices_per_face; ++v)
               for (unsigned int i=0; i<fe.dofs_per_vertex; ++i)
                 {
index b735ed4b3e85196232b22a4c532b85283a74ac77..1c32c781da237b58c8646d66ad1e89f96c24e271 100644 (file)
@@ -80,7 +80,7 @@ void test()
            cell = dof_handler.begin_active(); cell != dof_handler.end(); ++cell)
         for (unsigned int f=0; f<GeometryInfo<dim>::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<GeometryInfo<dim>::vertices_per_face; ++v)
               for (unsigned int i=0; i<fe.dofs_per_vertex; ++i)
                 {
index 7b8e6403a5e8bc384eb2747d5e3168a599e9dc59..e604a16e7f7488ec52d594baaffc9af6a4eb1079 100644 (file)
@@ -73,7 +73,7 @@ void test()
            cell = dof_handler.begin_active(); cell != dof_handler.end(); ++cell)
         for (unsigned int f=0; f<GeometryInfo<dim>::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<GeometryInfo<dim>::vertices_per_face; ++v)
               for (unsigned int i=0; i<fe.dofs_per_vertex; ++i)
                 {
index 56b0256402f1417a1b1c23be3c0fd4ea799c4364..78c0a2d9c3fd017ea1016665fddb4f3deddd4ab1 100644 (file)
@@ -81,7 +81,7 @@ void test()
            cell = dof_handler.begin_active(); cell != dof_handler.end(); ++cell)
         for (unsigned int f=0; f<GeometryInfo<dim>::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<GeometryInfo<dim>::vertices_per_face; ++v)
               for (unsigned int i=0; i<fe.dofs_per_vertex; ++i)
                 {
index 0ba9b4f871475978fb71d5bf3752dd0e7fedb658..2b7c344249bf670eacd0687cc977f4156f1eb0b6 100644 (file)
@@ -48,7 +48,7 @@ void test ()
 {
   Triangulation<dim> 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();
index 502f24b36a5dd0fe799ba6c573fc04febfa20dae..7252a7dc6a099c12d1558bb6b17af8e9233b051d 100644 (file)
@@ -50,7 +50,7 @@ void test (unsigned int chunk_size)
 {
   Triangulation<dim> 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();
index 71e36fbc68ab1d1a5cd5bac3badcda4165714f2d..86861c94ae29b0852ab604525c022b81660432a6 100644 (file)
@@ -119,7 +119,7 @@ CurvedLine<dim>::get_new_point_on_line (const typename Triangulation<dim>::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<dim>::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
index 13cb5caf7d8a1ba5ad04f6ea062aa037be8f9664..c095d8f3a435ad0ed2e824f1d520a7fcf7d69588 100644 (file)
@@ -55,7 +55,7 @@ void check (double r1, double r2, unsigned int n)
       for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
        if (c->face(f)->at_boundary())
          for (unsigned int e=0; e<GeometryInfo<dim>::lines_per_face; ++e)
-           c->face(f)->line(e)->set_boundary_indicator(0);
+           c->face(f)->line(e)->set_boundary_id(0);
   
   static const HyperShellBoundary<dim> boundary(center);
   tria.set_boundary(0, boundary);
index 5277e6887d78373cb2bc4244916feb158650ffa7..1d7a49b70bb41cdbde0596a843d4c88b0b0a68c1 100644 (file)
@@ -67,7 +67,7 @@ void check (const unsigned int n)
        cell != tria.end(); ++cell)
     for (unsigned int f=0; f<GeometryInfo<dim>::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;
 }
 
index 7e7467f67efc910b3f5856da1eedc74c48b72426..05c24061664a904572f4e8b6feb9990dfd58ac58 100644 (file)
@@ -52,9 +52,9 @@ void check (double r1, double r2, unsigned int n)
     for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
       if (cell->face(f)->at_boundary())
         for (unsigned int l=0; l<GeometryInfo<dim>::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;
index 6284060a93347cdc5e8b5998ce592426dadb3b94..555ffd1acab26cca133eb46d5fccb47aa67c3c89 100644 (file)
@@ -41,8 +41,8 @@ void test ()
 {
   Triangulation<dim> 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;
index 7fc37adec69428d66d2e44c3a1482139a0999901..5abb968cfd90f6a11b28327f7797e9e40c961526 100644 (file)
@@ -41,8 +41,8 @@ void test ()
 {
   Triangulation<dim> 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;
index 6284060a93347cdc5e8b5998ce592426dadb3b94..555ffd1acab26cca133eb46d5fccb47aa67c3c89 100644 (file)
@@ -41,8 +41,8 @@ void test ()
 {
   Triangulation<dim> 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;
index ebff5d58805011d6236ac2af804a642151219762..272a1e4046b49eec2dbbfe4d71e8a09698c826d7 100644 (file)
@@ -112,7 +112,7 @@ CurvedLine<dim>::get_new_point_on_line (const typename Triangulation<dim>::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);
         };
 
 
index ac8d3d57691ac8d81aa911f0b90039563c405dac..1a48cc1e74cc6896303cbe523bc4c0d7abf70974 100644 (file)
@@ -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);
 }
index 2a7f5beb16d2eab3da4ac14846a49f344463b45b..9efca9c37a5bb40f2e6f773dfcccabfc18f239c5 100644 (file)
@@ -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);
 }
index 08eeabaee79c10603b643c189f36607db785fdb0..b316f2451519779be03ecbfecb3222bfeb7b3e58 100644 (file)
@@ -90,7 +90,7 @@ int main ()
                       // circle.
                       new_points.insert(std::pair<types::global_dof_index, Point<dim> > (
                                           face->vertex_index(vertex_no), n_radius/inner_radius*v+n_center));
-                      face->set_boundary_indicator(1);
+                      face->set_boundary_id(1);
                     }
                   else
                     Assert(false, ExcInternalError());
index 4c72c8ccf82e270c1229456a0a7f8ad433e49db0..0741f9f92a4d7f876cfe95614c7883c9d34f8049 100644 (file)
@@ -100,7 +100,7 @@ int main ()
                       // circle.
                       new_points.insert(std::pair<types::global_dof_index, Point<dim> > (
                                           face->vertex_index(vertex_no), n_radius/inner_radius*v+n_center));
-                      face->set_boundary_indicator(1);
+                      face->set_boundary_id(1);
                     }
                   else
                     Assert(false, ExcInternalError());
index e0149880661c6a6186bc7561cc0adf6020d4e3ec..d486ece3dce4359463d64864cbdc68e13ff53831 100644 (file)
@@ -151,15 +151,15 @@ void FindBug<dim>::dirichlet_conditions ()
 
 
   std::vector<bool> fixed_dofs (dof_handler.n_dofs());
-  std::set<types::boundary_id> boundary_indicators;
-  boundary_indicators.insert (0);
+  std::set<types::boundary_id> 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
index 7c30ca6def0f51a97ced74e3d6fd29e051ff54ac..8ff87980455d2c85215aae597c5dd37babc61ac6 100644 (file)
@@ -51,8 +51,8 @@ void test ()
   DoFHandler<dim>      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);
index 188f65cdf6a5b99a69f9f6cc28ebf34735e8d0d4..197c54faa92960017b4713670c44de8b8bbf3b70 100644 (file)
@@ -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);
 
index a2ca153120d44c3c5d3e34946352cb177295a332..3b8f2b07ff0245ea96e4e0d7179e684d1e28fb80 100644 (file)
@@ -56,7 +56,7 @@ void mesh_info(const Triangulation<dim> &tria)
         for (unsigned int face=0; face<GeometryInfo<dim>::faces_per_cell; ++face)
           {
             if (cell->face(face)->at_boundary())
-              boundary_count[cell->face(face)->boundary_indicator()]++;
+              boundary_count[cell->face(face)->boundary_id()]++;
           }
       }
 
index 9b2e18e0508ca404643937b223e2578918102c03..06d1ddfaa4405d90b058e8e92370b5197213efe6 100644 (file)
@@ -103,7 +103,7 @@ void mesh_info(const Triangulation<dim> &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: ";
index 1d3e2083410251337501cc8ea8a20d8b94040c69..f5f499c9f75ea30354cdd2f74c03ca45ddfe66bb 100644 (file)
@@ -67,7 +67,7 @@ void test_hyper_cube()
   GridGenerator::hyper_cube(tr);
 
   for (unsigned int i=0; i<GeometryInfo<dim>::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);
 
index 179ddc274d5142e5bd021e9b5714e027fff42f11..03cb2446f73f084b558a105607b07bb2497953d8 100644 (file)
@@ -69,7 +69,7 @@ void test_hyper_cube()
   GridGenerator::hyper_cube(tr);
 
   for (unsigned int i=0; i<GeometryInfo<dim>::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);
 
index 1f0dd56e7a989f63f52e8b6ed562da6aebd4514f..5c2fa9158332d7471edbceb13ddd16efa9beada8 100644 (file)
@@ -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<GeometryInfo<3>::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<GeometryInfo<3>::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<GeometryInfo<3>::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<GeometryInfo<3>::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<GeometryInfo<3>::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<GeometryInfo<3>::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<unsigned char> no_normal_flux_boundaries;
   no_normal_flux_boundaries.insert (0);
index 376192fd98a489c0c77555735bb1c3b916a80907..15873de6abcf23862f52c95a30a9d95019eed502 100644 (file)
@@ -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);
                      }
                  }
              }
index b883f2db7311c471ce2c1b575a48c61fd17746d8..a0f695ee2eac04040e972e82a2750f656f407ee9 100644 (file)
@@ -36,7 +36,7 @@ void test()
 {\r
   Triangulation<dim> triangulation;\r
   GridGenerator::hyper_cube (triangulation,-1.0,1.0);\r
-  triangulation.begin_active()->face(1)->set_all_boundary_indicators(1);\r
+  triangulation.begin_active()->face(1)->set_all_boundary_ids(1);\r
 \r
   FE_Q<dim> fe(1);\r
   DoFHandler<dim> dof_handler(triangulation);\r
index 82314a02ee48d379b303a75a4d94b869cfdc06a4..9f87c2a7b2172ebc228c340397e4fa842551727f 100644 (file)
@@ -63,7 +63,7 @@ void test_hyper_cube()
   GridGenerator::hyper_cube(tr);
 
   for (unsigned int i=0; i<GeometryInfo<dim>::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);
 
index 5391bfcfa8920943187ea27ba9dd41a033c66441..83c876254418067fe65a0493e0b83fd6af80cd1f 100644 (file)
@@ -65,7 +65,7 @@ void test_hyper_cube()
   GridGenerator::hyper_cube(tr);
 
   for (unsigned int i=0; i<GeometryInfo<dim>::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);
 
index 38a8c70d109fdb676f9607156f59d023fd9f82e3..45d1e325e063f71e519e14b825a46c8e0fe22030 100644 (file)
@@ -67,7 +67,7 @@ void test_hyper_cube()
   GridGenerator::hyper_cube(tr);
 
   for (unsigned int i=0; i<GeometryInfo<dim>::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);
 
index 1408647e0842877ec70ba35185bd7b94444ca211..9e51c7a43af853d40bdefdbd0dffaa3019411dd1 100644 (file)
@@ -69,7 +69,7 @@ void test_hyper_cube()
   GridGenerator::hyper_cube(tr);
 
   for (unsigned int i=0; i<GeometryInfo<dim>::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);
 
index 850d8469060fba4ae5d229a7d1741cf90f0aef28..1bbfd566dbd208939c7f87d22f0fc86443809595 100644 (file)
@@ -66,7 +66,7 @@ void test_hyper_cube()
   GridGenerator::hyper_cube(tr);
 
   for (unsigned int i=0; i<GeometryInfo<dim>::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);
 
index 56582ba1fca971f9e063717c17f33e43cd661c43..e587816a6435501a7c5b367fa13230bd7ef65fc0 100644 (file)
@@ -103,7 +103,7 @@ void test_hyper_cube()
   GridGenerator::hyper_cube(tr);
 
   for (unsigned int i=0; i<GeometryInfo<dim>::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);
 
index 88c691a1326baff489f650d626636e5922b0e829..62cf36fe43b10218d62cccd50c3c1ee160149481 100644 (file)
@@ -102,7 +102,7 @@ void test_hyper_cube()
   GridGenerator::hyper_cube(tr);
 
   for (unsigned int i=0; i<GeometryInfo<dim>::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);
 
index 3e8530e9c67fb388642f809ebe1947911a4042c2..0abc0aed8d1d358fe7fe7d496b5de7af11e079c8 100644 (file)
@@ -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;
     }
 }
 
index 244017f88ee9aad7fb2d6ed5c7ec510dd9e564d5..ab5c884f540b616300b556e37aa0ab3e82b1a4ea 100644 (file)
@@ -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<types::boundary_id>
-  boundary_ids = tria.get_boundary_indicators ();
+  boundary_ids = tria.get_boundary_ids ();
 
   for (unsigned int i=0; i<boundary_ids.size(); ++i)
     deallog << (int)boundary_ids[i] << std::endl;
index 688c7a05483466fc843daa19f581c77a70b16b37..a8677e851004a37ea7b7bd11afc8658ab6623cd5 100644 (file)
@@ -15,7 +15,7 @@
 
 
 // verify that we can do things like cell->face() 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;
 }
 
index 129eaa69a56db4196803e0bf78eb21135e495c1d..ab7fc1c14c8c0fcee43777a13f157b1846ab4fec 100644 (file)
@@ -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<types::boundary_id>
-  boundary_ids = tria.get_boundary_indicators ();
+  boundary_ids = tria.get_boundary_ids ();
 
   for (unsigned int i=0; i<boundary_ids.size(); ++i)
     deallog << (int)boundary_ids[i] << std::endl;
index 62ab8c2a32ea16a5785c7ed1dcbc09cb01df7ea8..645daa9aee6b260f759380f42df8e02f18dabc0e 100644 (file)
@@ -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);
 
-  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;
 }
 
 
index 0d78280b63c7fded0278d4aee8c4f01bf758acb9..214ecfcc1cc0f4d6e40ca080c3048f56ea95b67d 100644 (file)
@@ -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);
 }
index 0cd63f7faac28337a33dc24d3d2bc8b41a375348..53544fc2406d964429f8ac8c70c6bb8349966e1f 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 43dc0e533e4c8be56f7806e41030885509792850..182c2f937bed8c2852117680462bf5249dbb2de8 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 40beaa555bb142af95e877e4851637fc81102ef0..676cf1f0ae53bfc1c5d4a3c84f9042074be4783e 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index f566244ca92a07c53c6a3f440018211288a30efb..74e3135a044987335cf59a9c925b292040920bd7 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index aa9ab9ae6cc75bc3579b16c76f40b7efd3af52d6..96df0e06cd664c92907e7a74c61f66cf090af394 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 5cf1ae5224ef70d4b2c18d72b65f951982c33187..989f6a7dd275a2a3af0b55ebbad1acb9648315ed 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 994f90643f82d4cfdff5758fb142a32011b902f7..7416497b6cd8ee9a38b5523760d6e41ddeae5518 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index c6f3685bdafa9e178bd2561cb072e80ac09a9d29..f4bee06eb1fe3d154464105c414b6e6d092d1ee3 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index abdbbe6af541f29c3b6457505c7268820e27b7b2..c8cec0445c1a18147667cd110f6378e3a0e0c7a7 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index f6d35d01ed7865325ba538fb3b0e010e0588a517..c1c8b5ac15dc2c0f276406484d0408fc8ab23850 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 74f7aec3e015c960c1465fe910394d326a173f0e..b35759d5bd705b1659d24d2f40ada6f4877a57fc 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 308110e6f8e6bbbae1a996f54b5aa0453ffebc7c..05cc886f9ffd185d491df07f250c8bbed68442d8 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 307c39180263c7274f52a29dc03274259093aaa2..fb4bcfc08a8bfec35ec199f7c18a9518339dbfc4 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index b2e0f22a49358f45da352f54fc2a8ad54c1dae02..0274c9983e95d4b3dddb082d016878d24301ba32 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index c15742af4d7508dfaafa6c35470bb512f06b5eab..f9d1bb6cc4030446ea5d8a080a8230950faa6cc4 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 30ea774ecd941cb4625a69b593dc5a4e8272a8aa..993a34118b41b213ee0a5c68489d4d4ccc1803d1 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index e278d3805e9824ee2beb86fc9b00898b68a47648..ad17cb0c7da799e8143cea571802250a88c19c26 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index e372679b08282aa499ad054502be1b1ba89353da..8e4cc3d0ecb5cb461f219d8b186910a05e726628 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index ea6768387564678f3d3b5866ed9864012523cdb9..662a65c43a4a60e42b274652ed0081d80f3ff4cd 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 79dbe2cbf3cabf1d47647325a51529205c554957..3e6613463e44e1508818eacdac5232390061cae8 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index cb8f6b5bb558fb6fc70b53ab81bcbe79c4b72013..27683a48c1ce020b85fd9ff3f1b6e501ce3493ab 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index f8be8723e3b1f562189607b09eaf2ae238036d8d..5382ca5582e5736923dcebf17c7518bef39e9201 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 9bbb249eac78173c991ab51a5af6f93e469b4eed..dfbedf25c55ef0807cba4ddd5b8f21138612706b 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 17ce614d692450611a7a4f179650a8a6abfe3fe1..add597f9d5880a3bd61f4fe385d6fc45b43be72a 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 9501c6f63021de53c3ef8b814312b1a809375189..88d8b9dad9e9fb5c686fe3dddbb4bc2a8e47f1a6 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 7525935a71491f7e6ce124fbbcd69e0e3ee74356..4e623a19209d6fbf4c7983ae84c43bfde620bc01 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 4eea77ea51702392e886cfce8c4ee1316789e43e..22146bc2f1c42f4893a1576a541728d0dad0a362 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 8357a63e5cce332ced46a9183ca58f2dd40b2a67..424faef1afb9e8f22bee36dcf6da0735c38b3347 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 65a82aaaf4962a92b74c1d3bbaf7fd620b12d288..e15ae2312bb7150f5be9c6c9910a9d6fd810e3f1 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index 8a380e0ba323f0d4abfb992c46be4e6053a3abce..345bfffc8a5aefa2a566fbb2e059f3a311ef7c7e 100644 (file)
@@ -157,7 +157,7 @@ void test()
   // set boundary id on cell 1
   for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
     if (tr.begin_active()->at_boundary(f))
-      tr.begin_active()->face(f)->set_boundary_indicator (1);
+      tr.begin_active()->face(f)->set_boundary_id (1);
 
   test(tr);
 }
index cb7bb6754008a96e95b6a0aed48a34f859e3c517..6f7d72bae14ec0529c79f59f3f9580334b0222a7 100644 (file)
@@ -307,8 +307,8 @@ void create_triangulations(std::vector<Triangulation<2> *> &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<Triangulation<2> *> &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<Triangulation<3> *> &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));
     }
 
index 7589c58dd04ed531b7711afe3e4886caa7e9a616..1de8780b312dec440fad823716e65101d24889c8 100644 (file)
@@ -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;
index c2c0edf1022808a26d091f9d9257f0e6ccbacd86..49d1aedfb851e6207a1bdcd222b900d1827ad32a 100644 (file)
@@ -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<dim> > unit_points(Utilities::fixed_power<dim>(n_points));
index d3f7159d08b6cc6c68647e198d48c288372aab0a..fb00db604b382b2357639e6173e1352e8300d3fe 100644 (file)
@@ -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<dim> > unit_points(Utilities::fixed_power<dim>(n_points));
index 2a44de7cc87c415662f65aa7aa020087eb463903..a765e1a72f1e9bdbcd7b8145a54cd1da7cc27e7a 100644 (file)
@@ -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
index f91ce956b58158a648e81af8327131389f2d1ceb..a615f1b692ee0e7eebe619ed78ff6f9c537986f7 100644 (file)
@@ -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
index d9687a4a4e0eb685e8f8ef64cf37f0ab1be2f24f..7f2826630ace169feb49425b2140f69361804d7a 100644 (file)
@@ -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
index e5434323c152a6e824ae735c66dc2f505910d3f3..281efb6fc32768c6203a13cb1683045ccf728d92 100644 (file)
@@ -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
index 8dcc945aa9a180ce6bf1dffc1c235da3a7ece7a5..9860ff538ee3121ff091f69b8872db4a9bfbd2be 100644 (file)
@@ -76,7 +76,7 @@ void test ()
   Vector<double> rhs_vector2(hp_dof_handler2.n_dofs());
 
   types::boundary_id myints[1] = {0};
-  std::set<types::boundary_id> boundary_indicators  (myints,myints+1);
+  std::set<types::boundary_id> 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,
index d6511443e6784739035b68a9f98efaa890e9e971..9c03b90df582ab8ce62f1af66b7fdc4a27549946 100644 (file)
@@ -269,8 +269,8 @@ void ElasticProblem<dim>::make_grid ()
   triangulationR.begin_active()->set_material_id(id_of_lagrange_mult);
 
   for (unsigned int i=0;i<n_faces_per_cell;i++) {
-    triangulationL.begin_active()->face(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);
index 4354841b2805187708b1d86d23b83a1be223025b..21df29fb9fd7fcd4bf77bfa5fec82ab49744ccbd 100644 (file)
@@ -327,7 +327,7 @@ void HelmholtzProblem<dim>::assemble_system ()
       for (unsigned int face=0; face<GeometryInfo<dim>::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<dim> &fe_face_values
@@ -503,7 +503,7 @@ void HelmholtzProblem<dim>::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 ();
index e253cc3d041e9bfbee9967a212022f7f4b1683e8..e3ae0a652cfbbcbf1f53a9f5fc9ff5d0a9dcde5f 100644 (file)
@@ -305,7 +305,7 @@ namespace Advection
   void AdvectionProblem<dim>::integrate_boundary_term (MeshWorker::DoFInfo<dim> &dinfo,
                                                        MeshWorker::IntegrationInfo<dim> &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
index 92c746dd34469749b695c52b66b4c51310ad9bca..6d119929badf75b96143103c66b4cc9ac0f5e2aa 100644 (file)
@@ -35,7 +35,7 @@ void print_info(Triangulation<dim,spacedim> &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;
     }
index 8be4dbb5608e11724f0a80694f063eb15bf4344f..4427f49f7b661b071db20d47d393a84e996a48d0 100644 (file)
@@ -40,7 +40,7 @@ void print_info(Triangulation<dim,spacedim> &tria) {
       for (unsigned int f=0; f<GeometryInfo<dim>::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;
     }
index af554f683783d20d0ad304f7991bd4192c743359..2b8c4578352fa5596cf3a4faf6f7f6593aaffce0 100644 (file)
@@ -38,7 +38,7 @@ void print_info(Triangulation<dim,spacedim> &tria) {
       for (unsigned int f=0; f<GeometryInfo<dim>::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;
     }
index 80259c0e47800f1be29c2fb9a88fd3161bd32561..d651922c5ab65c51e157e6abfbd6b13941af7f4c 100644 (file)
@@ -38,7 +38,7 @@ void print_info(Triangulation<dim,spacedim> &tria) {
       for (unsigned int f=0; f<GeometryInfo<dim>::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;
     }
index d734b54814ac35cc4326da5dea9e2222b27bdbe7..d2d3c9b284f363d284394e84b8f94a1bfe9c72bc 100644 (file)
@@ -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<dim,spacedim> &t1)
   for (; c1 != t1.end(); ++c1)
     for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
       if (c1->at_boundary(f))
-        c1->face(f)->set_boundary_indicator (42);
+        c1->face(f)->set_boundary_id (42);
 }
 
 
index b06df18e8268d827c71410e26c6cce02eff3675c..6d4f099a50785c15e4a8a6a0b16fdeb0cad2c131 100644 (file)
@@ -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<dim,spacedim> &t1)
   for (; c1 != t1.end(); ++c1)
     for (unsigned int f=0; f<GeometryInfo<dim>::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);
       }
 }
index f7e5cdfe90a64501cb9412e919848433268a50ea..b0b4ce1cf1d77db16c37042a712cebaa4376a267 100644 (file)
@@ -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<dim,spacedim> &t1)
   for (; c1 != t1.end(); ++c1)
     for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
       if (c1->at_boundary(f))
-        c1->face(f)->set_boundary_indicator (42);
+        c1->face(f)->set_boundary_id (42);
 }
 
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.