As discussed at the workshop, rename types::material_id_t to types::material_id and...

git-svn-id: https://svn.dealii.org/trunk@26086 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/bits/anna_4.cc b/tests/bits/anna_4.cc
index 1cbcfa3a25b9e03d80147aaf98533f24995f9381..f990548eb0116162ff56ec3240d8f27be807d82a 100644 (file)
--- a/tests/bits/anna_4.cc
+++ b/tests/bits/anna_4.cc
@@ -187,7 +187,7 @@ void FindBug<dim>::dirichlet_conditions ()
 
 
   std::vector<bool> fixed_dofs (dof_handler.n_dofs());
-  std::set<types::boundary_id_t> boundary_indicators;
+  std::set<types::boundary_id> boundary_indicators;
   boundary_indicators.insert (0);
 
                                    // get a list of those boundary DoFs which

diff --git a/tests/bits/anna_6.cc b/tests/bits/anna_6.cc
index b40d2e8616e8ef9f251969660cff90591b005d2d..eb9233b28e78d6f252ca221303d911ed5a21ce83 100644 (file)
--- a/tests/bits/anna_6.cc
+++ b/tests/bits/anna_6.cc
@@ -183,7 +183,7 @@ 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_t> boundary_indicators;
+  std::set<types::boundary_id> boundary_indicators;
   boundary_indicators.insert (0);
   DoFTools::extract_boundary_dofs (dof_handler, 
                                    bc_component_select,
@@ -222,7 +222,7 @@ 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_t> boundary_indicators;
+  std::set<types::boundary_id> boundary_indicators;
   boundary_indicators.insert (0);
   DoFTools::extract_boundary_dofs (dof_handler, 
                                    bc_component_select,

diff --git a/tests/bits/dof_tools_05.cc b/tests/bits/dof_tools_05.cc
index b2af03a4836c199efd4e7e5ce1f4579a63cbb083..d08f3eedd4d7469e08b5071dfa992eb787f22a07 100644 (file)
--- a/tests/bits/dof_tools_05.cc
+++ b/tests/bits/dof_tools_05.cc
@@ -51,7 +51,7 @@ check_this (const DoFHandler<dim> &dof_handler)
                                    // third further restrict to
                                    // boundary indicator 0
   {
-    std::set<types::boundary_id_t> boundary_ids;
+    std::set<types::boundary_id> boundary_ids;
     boundary_ids.insert (0);
     DoFTools::extract_boundary_dofs (dof_handler,
                                      component_select,

diff --git a/tests/bits/dof_tools_09.cc b/tests/bits/dof_tools_09.cc
index 5037e61eab3f45891f37b2fb59bb05daa1d11381..11552d6bde166683b6352534c06e4194b0a0efd5 100644 (file)
--- a/tests/bits/dof_tools_09.cc
+++ b/tests/bits/dof_tools_09.cc
@@ -16,7 +16,7 @@
 
 // check
 //   DoFTools::map_dof_to_boundary_indices(const DoFHandler<int>     &,
-//                                         const std::set<types::boundary_id_t> &,
+//                                         const std::set<types::boundary_id> &,
 //                                         std::vector<unsigned int> &)
 
 
@@ -28,7 +28,7 @@ void
 check_this (const DoFHandler<dim> &dof_handler)
 {
   std::vector<unsigned int> map(dof_handler.n_dofs());
-  std::set<types::boundary_id_t> boundary_ids;
+  std::set<types::boundary_id> boundary_ids;
 
                                    // check for boundary id 0 alone
   boundary_ids.insert (0);

diff --git a/tests/bits/dof_tools_14.cc b/tests/bits/dof_tools_14.cc
index 135a084f5f357a40e516a527b49a742cde6e897b..428f7fc9d258c7176a8a84000633dced89c58d6f 100644 (file)
--- a/tests/bits/dof_tools_14.cc
+++ b/tests/bits/dof_tools_14.cc
@@ -36,7 +36,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   deallog << dof_handler.n_boundary_dofs(fm) << std::endl;
   
                                    // with std::set
-  std::set<types::boundary_id_t> s;
+  std::set<types::boundary_id> s;
   s.insert (0);
   deallog << dof_handler.n_boundary_dofs(s) << std::endl;
   

diff --git a/tests/bits/dof_tools_16a.cc b/tests/bits/dof_tools_16a.cc
index 2173bb0c30c592da597aa12515eecdce7d616a42..0d2e046887ebbecc1d495b3eaad000feb0663629 100644 (file)
--- a/tests/bits/dof_tools_16a.cc
+++ b/tests/bits/dof_tools_16a.cc
@@ -36,7 +36,7 @@ check_this (const DoFHandler<dim> &dof_handler)
     return;
   
   std::vector<unsigned int> map (dof_handler.n_dofs());
-  std::set<types::boundary_id_t> set;
+  std::set<types::boundary_id> set;
   set.insert (0);
   DoFTools::map_dof_to_boundary_indices (dof_handler, set, map);
   

diff --git a/tests/bits/dof_tools_16b.cc b/tests/bits/dof_tools_16b.cc
index 805d3cd67b8364a672dd413608bfc3bf1a11fc22..c2e3f797da1cd2cb09653f7c7fe4ef5ed9d91be7 100644 (file)
--- a/tests/bits/dof_tools_16b.cc
+++ b/tests/bits/dof_tools_16b.cc
@@ -35,7 +35,7 @@ check_this (const DoFHandler<dim> &dof_handler)
     return;
   
   std::vector<unsigned int> map (dof_handler.n_dofs());
-  std::set<types::boundary_id_t> set;
+  std::set<types::boundary_id> set;
   set.insert (0);
   DoFTools::map_dof_to_boundary_indices (dof_handler, set, map);
   

diff --git a/tests/bits/dof_tools_16b_x.cc b/tests/bits/dof_tools_16b_x.cc
index 97c1eb886056588ac38a1d334a15328c05823df5..e88a192fee71de1f3e68d20d3c4f98df547c0591 100644 (file)
--- a/tests/bits/dof_tools_16b_x.cc
+++ b/tests/bits/dof_tools_16b_x.cc
@@ -35,7 +35,7 @@ check_this (const DoFHandler<dim> &dof_handler)
     return;
   
   std::vector<unsigned int> map (dof_handler.n_dofs());
-  std::set<types::boundary_id_t> set;
+  std::set<types::boundary_id> set;
   set.insert (0);
   DoFTools::map_dof_to_boundary_indices (dof_handler, set, map);
   

diff --git a/tests/bits/dof_tools_16c.cc b/tests/bits/dof_tools_16c.cc
index d8476fe0cc046bedf656cbcc933e58c2183d7853..f758ee33944ae170427b95d8772ac2a20cff57a6 100644 (file)
--- a/tests/bits/dof_tools_16c.cc
+++ b/tests/bits/dof_tools_16c.cc
@@ -35,7 +35,7 @@ check_this (const DoFHandler<dim> &dof_handler)
     return;
   
   std::vector<unsigned int> map (dof_handler.n_dofs());
-  std::set<types::boundary_id_t> set;
+  std::set<types::boundary_id> set;
   set.insert (0);
   DoFTools::map_dof_to_boundary_indices (dof_handler, set, map);
   

diff --git a/tests/bits/dof_tools_16d.cc b/tests/bits/dof_tools_16d.cc
index 035c54513d0b6070276c5ba2c62845e84945d17d..1634cf490cc91c9aa42a80098f4c87b9af58c543 100644 (file)
--- a/tests/bits/dof_tools_16d.cc
+++ b/tests/bits/dof_tools_16d.cc
@@ -35,7 +35,7 @@ check_this (const DoFHandler<dim> &dof_handler)
     return;
   
   std::vector<unsigned int> map (dof_handler.n_dofs());
-  std::set<types::boundary_id_t> set;
+  std::set<types::boundary_id> set;
   set.insert (0);
   DoFTools::map_dof_to_boundary_indices (dof_handler, set, map);
 

diff --git a/tests/bits/dof_tools_16d_x.cc b/tests/bits/dof_tools_16d_x.cc
index 347f3db0d4c1d5741de6a8553ffdb5def5b750eb..ad9204f157d2a82844c46482b1b4e35522e97213 100644 (file)
--- a/tests/bits/dof_tools_16d_x.cc
+++ b/tests/bits/dof_tools_16d_x.cc
@@ -35,7 +35,7 @@ check_this (const DoFHandler<dim> &dof_handler)
     return;
   
   std::vector<unsigned int> map (dof_handler.n_dofs());
-  std::set<types::boundary_id_t> set;
+  std::set<types::boundary_id> set;
   set.insert (0);
   DoFTools::map_dof_to_boundary_indices (dof_handler, set, map);
 

diff --git a/tests/bits/dof_tools_20.cc b/tests/bits/dof_tools_20.cc
index 3e4e9501df38e500acf70850f2908bd9e1ee179f..677b03f4930fba1ad3319bbe3da3b9dfa05cf448 100644 (file)
--- a/tests/bits/dof_tools_20.cc
+++ b/tests/bits/dof_tools_20.cc
@@ -51,7 +51,7 @@ check_this (const DoFHandler<dim> &dof_handler)
                                    // third further restrict to
                                    // boundary indicator 0
   {
-    std::set<types::boundary_id_t> boundary_ids;
+    std::set<types::boundary_id> boundary_ids;
     boundary_ids.insert (0);
     DoFTools::extract_dofs_with_support_on_boundary (dof_handler,
                                      component_select,

diff --git a/tests/bits/error_estimator_01.cc b/tests/bits/error_estimator_01.cc
index 1dd208494be78f3d77301ca35d86b52180ec105e..6148aff77dbb8d316b49430e112a507eee2b68ad 100644 (file)
--- a/tests/bits/error_estimator_01.cc
+++ b/tests/bits/error_estimator_01.cc
@@ -130,7 +130,7 @@ check ()
   MappingQ<dim> mapping(3);
   Quadrature<dim-1> &q_face = get_q_face(function);
 
-  std::map<types::boundary_id_t,const Function<dim>*> neumann_bc;
+  std::map<types::boundary_id,const Function<dim>*> neumann_bc;
   neumann_bc[0] = &function;
   
   Vector<double> v (dof.n_dofs());

diff --git a/tests/bits/error_estimator_02.cc b/tests/bits/error_estimator_02.cc
index 89171bebdcbd37b896b637df96b6cd578fa74ab2..6169d491befbba84a12aeaeb925a373549fc79fb 100644 (file)
--- a/tests/bits/error_estimator_02.cc
+++ b/tests/bits/error_estimator_02.cc
@@ -130,7 +130,7 @@ check ()
   MappingQ<dim> mapping(3);
   Quadrature<dim-1> &q_face = get_q_face(function);
 
-  std::map<types::boundary_id_t,const Function<dim>*> neumann_bc;
+  std::map<types::boundary_id,const Function<dim>*> neumann_bc;
   neumann_bc[0] = &function;
   
   Vector<double> v (dof.n_dofs());

diff --git a/tests/bits/get_boundary_indicators_1d.cc b/tests/bits/get_boundary_indicators_1d.cc
index 72044ac50009ff31e111474d2b014467bf6e7b91..4ae93c48458491e2a3638962f63d4b732185f088 100644 (file)
--- a/tests/bits/get_boundary_indicators_1d.cc
+++ b/tests/bits/get_boundary_indicators_1d.cc
@@ -26,7 +26,7 @@ int main ()
 
   Triangulation<1>   triangulation;
   GridGenerator::hyper_cube (triangulation, -1, 1);
-  const std::vector<types::boundary_id_t> indicators = triangulation.get_boundary_indicators();
+  const std::vector<types::boundary_id> indicators = triangulation.get_boundary_indicators();
   for (unsigned int i=0; i<indicators.size(); ++i)
     deallog << int (indicators[i]) << std::endl;
 

diff --git a/tests/bits/grid_generator_03.cc b/tests/bits/grid_generator_03.cc
index 324937dc814dbf1809b981c74ad28aef6054281e..6db71d453f4e9d1f45bc6b192c004e8a0c2b6577 100644 (file)
--- a/tests/bits/grid_generator_03.cc
+++ b/tests/bits/grid_generator_03.cc
@@ -27,39 +27,39 @@
 #include <iomanip>
 
 
-template <int dim> Table<dim,types::material_id_t> material_ids();
+template <int dim> Table<dim,types::material_id> material_ids();
 
-template <> Table<1,types::material_id_t> material_ids<1>()
+template <> Table<1,types::material_id> material_ids<1>()
 {
-  Table<1,types::material_id_t> t(2);
+  Table<1,types::material_id> t(2);
   for (unsigned int i=0; i<2; ++i)
     t[i] = 1;
   return t;
 }
 
 
-template <> Table<2,types::material_id_t> material_ids<2>()
+template <> Table<2,types::material_id> material_ids<2>()
 {
-  Table<2,types::material_id_t> t(2,3);
+  Table<2,types::material_id> t(2,3);
   for (unsigned int i=0; i<2; ++i)
     for (unsigned int j=0; j<3; ++j)
       t[i][j] = 1;
                                   // produce a hole in the middle
-  t[1][1] = (types::material_id_t)(-1);
+  t[1][1] = (types::material_id)(-1);
   return t;
 }
 
 
-template <> Table<3,types::material_id_t> material_ids<3>()
+template <> Table<3,types::material_id> material_ids<3>()
 {
-  Table<3,types::material_id_t> t(2,3,4);
+  Table<3,types::material_id> t(2,3,4);
   for (unsigned int i=0; i<2; ++i)
     for (unsigned int j=0; j<3; ++j)
       for (unsigned int k=0; k<4; ++k)
        t[i][j][k] = 1;
                                   // produce a hole in the middle
-  t[1][1][1] = (types::material_id_t)(-1);
-  t[1][1][2] = (types::material_id_t)(-1);
+  t[1][1][1] = (types::material_id)(-1);
+  t[1][1][2] = (types::material_id)(-1);
   return t;
 }
 

diff --git a/tests/codim_one/boundary_indicator_01.cc b/tests/codim_one/boundary_indicator_01.cc
index 4eef579dcc19e94007f53ec0c70f6499d9793490..f44ca072956b8338aebc3c16958aed600203c8e7 100644 (file)
--- a/tests/codim_one/boundary_indicator_01.cc
+++ b/tests/codim_one/boundary_indicator_01.cc
@@ -85,7 +85,7 @@ int main ()
 
                                     // now extract a mesh of the 5
                                     // surface faces
-    std::set<types::boundary_id_t> boundary_indicators;
+    std::set<types::boundary_id> boundary_indicators;
     boundary_indicators.insert (0);
     GridTools::extract_boundary_mesh (volume_mesh, boundary_mesh,
                                      boundary_indicators);

diff --git a/tests/codim_one/data_out_03.cc b/tests/codim_one/data_out_03.cc
index ce266641ba4bca11b5930cc506e31fde9c226169..a12f0eebcfa8d4bf3bae7456de757a0d1071a598 100644 (file)
--- a/tests/codim_one/data_out_03.cc
+++ b/tests/codim_one/data_out_03.cc
@@ -88,7 +88,7 @@ int main ()
   tria.set_boundary (1, surface_description);
   tria.set_boundary (0, surface_description);
 
-  std::set<types::boundary_id_t> boundary_ids;
+  std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert(0);
 
   GridTools::extract_boundary_mesh (volume_mesh, tria,

diff --git a/tests/codim_one/error_estimator_01.cc b/tests/codim_one/error_estimator_01.cc
index dd5caf3843735cdf306311e4a1d21550bae5c329..d7f01aafb59ad624249f90b560e9871e737c70fc 100644 (file)
--- a/tests/codim_one/error_estimator_01.cc
+++ b/tests/codim_one/error_estimator_01.cc
@@ -128,7 +128,7 @@ check ()
   MappingQ<dim,spacedim> mapping(3);
   Quadrature<dim-1> &q_face = get_q_face<dim>();
 
-  std::map<types::boundary_id_t,const Function<spacedim>*> neumann_bc;
+  std::map<types::boundary_id,const Function<spacedim>*> neumann_bc;
   neumann_bc[0] = &function;
   
   Vector<double> v (dof.n_dofs());

diff --git a/tests/codim_one/extract_boundary_mesh_00.cc b/tests/codim_one/extract_boundary_mesh_00.cc
index 6ab6d7af3a8c23fb38b977dc176e8246b54c7db1..9bc1495cbb9a7a1cb6a65a712384b7c0aa3053e2 100644 (file)
--- a/tests/codim_one/extract_boundary_mesh_00.cc
+++ b/tests/codim_one/extract_boundary_mesh_00.cc
@@ -165,7 +165,7 @@ int main ()
     save_mesh(volume_mesh);
 
     Triangulation<dim-1,dim> boundary_mesh;
-    set<types::boundary_id_t> boundary_ids;
+    set<types::boundary_id> boundary_ids;
     boundary_ids.insert(0);
 
     surface_to_volume_mapping

diff --git a/tests/codim_one/extract_boundary_mesh_04.cc b/tests/codim_one/extract_boundary_mesh_04.cc
index bebed43111687eb160ca8a05637489b1a5b03e9c..9ddcdd0c4d5d358505741c304843521a302b47f4 100644 (file)
--- a/tests/codim_one/extract_boundary_mesh_04.cc
+++ b/tests/codim_one/extract_boundary_mesh_04.cc
@@ -117,7 +117,7 @@ int main ()
     boundary_mesh.set_boundary (1, surface_description);
     boundary_mesh.set_boundary (0, surface_description);
 
-    set<types::boundary_id_t> boundary_ids;
+    set<types::boundary_id> boundary_ids;
     boundary_ids.insert(1);
 
     surface_to_volume_mapping

diff --git a/tests/codim_one/hanging_nodes_01.cc b/tests/codim_one/hanging_nodes_01.cc
index 4bc550b78365ced7dbb6306847fbb132b9b20e09..23f95ff4d1995d0854f00c5b691384ff5257e7cc 100644 (file)
--- a/tests/codim_one/hanging_nodes_01.cc
+++ b/tests/codim_one/hanging_nodes_01.cc
@@ -50,7 +50,7 @@ int main ()
       cell = volume_mesh.begin_active();
 
     cell->face(0)->set_all_boundary_indicators (1);
-    std::set<types::boundary_id_t> boundary_ids;
+    std::set<types::boundary_id> boundary_ids;
     boundary_ids.insert(0);
     GridTools::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 0c9dae13ec767c25e7d290994a7867497c5a0825..1d49197267e8614ffd8d55d3259ca6b966ad23c8 100644 (file)
--- a/tests/codim_one/hanging_nodes_02.cc
+++ b/tests/codim_one/hanging_nodes_02.cc
@@ -50,7 +50,7 @@ int main ()
       cell = volume_mesh.begin_active();
 
     cell->face(0)->set_all_boundary_indicators (1);
-    std::set<types::boundary_id_t> boundary_ids;
+    std::set<types::boundary_id> boundary_ids;
     boundary_ids.insert(0);
     GridTools::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 12b76b3f30d8462d8be14d0b269c0400bd7f487a..52c18f923df33d85f0883553db90fdda79e8f3e7 100644 (file)
--- a/tests/codim_one/hanging_nodes_03.cc
+++ b/tests/codim_one/hanging_nodes_03.cc
@@ -44,7 +44,7 @@ int main ()
       cell = volume_mesh.begin_active();
 
     cell->face(0)->set_all_boundary_indicators (1);
-    std::set<types::boundary_id_t> boundary_ids;
+    std::set<types::boundary_id> boundary_ids;
     boundary_ids.insert(0);
     GridTools::extract_boundary_mesh (volume_mesh, boundary_mesh, boundary_ids);
   }

diff --git a/tests/codim_one/interpolate_boundary_values_03.cc b/tests/codim_one/interpolate_boundary_values_03.cc
index 28e10ac822ee6275bda2335c2243d3ec2293a4be..225d791ccac7842ab136096cc2b714cba3fd527a 100644 (file)
--- a/tests/codim_one/interpolate_boundary_values_03.cc
+++ b/tests/codim_one/interpolate_boundary_values_03.cc
@@ -38,7 +38,7 @@ void test() {
   Triangulation<dim, spacedim> tria;
   Triangulation<spacedim> volume_mesh;
   GridGenerator::half_hyper_ball(volume_mesh);
-  std::set<types::boundary_id_t> boundary_ids;
+  std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert(0);
   
   GridTools::extract_boundary_mesh (volume_mesh, tria,boundary_ids);

diff --git a/tests/codim_one/transform_01.cc b/tests/codim_one/transform_01.cc
index e7700d4f0e3007e32406a9c53bc91ab3639bd936..4d48db6c2a99b86ff648a9502aa4024d107db09a 100644 (file)
--- a/tests/codim_one/transform_01.cc
+++ b/tests/codim_one/transform_01.cc
@@ -68,7 +68,7 @@ int main ()
   triangulation.set_boundary (1, surface_description);
   triangulation.set_boundary (0, surface_description);
   
-  std::set<types::boundary_id_t> boundary_ids;
+  std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert(0);
   
   GridTools::extract_boundary_mesh (volume_mesh, triangulation,

diff --git a/tests/deal.II/error_estimator.cc b/tests/deal.II/error_estimator.cc
index 2b1ec9b177daef19502d10276df229aef65e76a7..9c919020f36d4f9f34179e3da3b326919ff035db 100644 (file)
--- a/tests/deal.II/error_estimator.cc
+++ b/tests/deal.II/error_estimator.cc
@@ -95,7 +95,7 @@ check ()
   MappingQ<dim> mapping(3);
   Quadrature<dim-1> &q_face = get_q_face(function);
 
-  std::map<types::boundary_id_t,const Function<dim>*> neumann_bc;
+  std::map<types::boundary_id,const Function<dim>*> neumann_bc;
   neumann_bc[0] = &function;
   
   Vector<double> v (dof.n_dofs());

diff --git a/tests/deal.II/error_estimator_01.cc b/tests/deal.II/error_estimator_01.cc
index af9002829dad7095824893a214517a82bd729d43..c0edc199c91289a860a3d5b33916271c8459e3e8 100644 (file)
--- a/tests/deal.II/error_estimator_01.cc
+++ b/tests/deal.II/error_estimator_01.cc
@@ -55,7 +55,7 @@ check ()
   MappingQ<dim,spacedim> mapping(3);
   QGauss<dim-1> q_face(4);
 
-  std::map<types::boundary_id_t,const Function<spacedim>*> neumann_bc;
+  std::map<types::boundary_id,const Function<spacedim>*> neumann_bc;
   neumann_bc[0] = &function;
   
   Vector<double> v (dof.n_dofs());

diff --git a/tests/deal.II/interpolate_boundary_values_01.cc b/tests/deal.II/interpolate_boundary_values_01.cc
index 53f41f7f820a36588d911e5807774cb6339ad175..f6ecedf81651295962587215dc57d9bb8d973d21 100644 (file)
--- a/tests/deal.II/interpolate_boundary_values_01.cc
+++ b/tests/deal.II/interpolate_boundary_values_01.cc
@@ -148,7 +148,7 @@ void FindBug<dim>::dirichlet_conditions ()
 
 
   std::vector<bool> fixed_dofs (dof_handler.n_dofs());
-  std::set<types::boundary_id_t> boundary_indicators;
+  std::set<types::boundary_id> boundary_indicators;
   boundary_indicators.insert (0);
 
                                    // get a list of those boundary DoFs which

diff --git a/tests/deal.II/no_flux_01.cc b/tests/deal.II/no_flux_01.cc
index c14aaf0b2b6292092c58c942a86895b49d6e9be8..30862e203cacac401de1b55bfdd7ccb03b0d25c2 100644 (file)
--- a/tests/deal.II/no_flux_01.cc
+++ b/tests/deal.II/no_flux_01.cc
@@ -45,7 +45,7 @@ void test (const Triangulation<dim>& tr,
              << ", case=" << i
              << std::endl;
 
-      std::set<types::boundary_id_t> boundary_ids;
+      std::set<types::boundary_id> boundary_ids;
       for (unsigned int j=0; j<=i; ++j)
        boundary_ids.insert (j);
       

diff --git a/tests/deal.II/no_flux_02.cc b/tests/deal.II/no_flux_02.cc
index 7b5eb66cee8c2e3f5114237d172422d6ef082aac..ed03b0cf98c2f54af2b9c6cfa38b0c58554afda7 100644 (file)
--- a/tests/deal.II/no_flux_02.cc
+++ b/tests/deal.II/no_flux_02.cc
@@ -47,7 +47,7 @@ void test (const Triangulation<dim>& tr,
              << ", case=" << i
              << std::endl;
 
-      std::set<types::boundary_id_t> boundary_ids;
+      std::set<types::boundary_id> boundary_ids;
       for (unsigned int j=0; j<=i; ++j)
        boundary_ids.insert (j);
       

diff --git a/tests/deal.II/no_flux_03.cc b/tests/deal.II/no_flux_03.cc
index 82e3904a7e7c58fe266e94d5b692289cea648fd0..420bc832472d2ef1f87f9d770541a98812eb0d0b 100644 (file)
--- a/tests/deal.II/no_flux_03.cc
+++ b/tests/deal.II/no_flux_03.cc
@@ -45,7 +45,7 @@ void test (const Triangulation<dim>& tr,
   deallog << "FE=" << fe.get_name()
          << std::endl;
 
-  std::set<types::boundary_id_t> boundary_ids;
+  std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert (0);
       
   ConstraintMatrix cm;

diff --git a/tests/deal.II/no_flux_04.cc b/tests/deal.II/no_flux_04.cc
index 00a87271dd35fb6a22687a93492ddc639d993fbd..1da08dc969230552101daed19da875270293c0d0 100644 (file)
--- a/tests/deal.II/no_flux_04.cc
+++ b/tests/deal.II/no_flux_04.cc
@@ -78,7 +78,7 @@ void test (const Triangulation<dim>& tr,
   deallog << "FE=" << fe.get_name()
          << std::endl;
 
-  std::set<types::boundary_id_t> boundary_ids;
+  std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert (0);
 
   ConstraintMatrix cm;

diff --git a/tests/deal.II/no_flux_05.cc b/tests/deal.II/no_flux_05.cc
index f30b0f593d6307f696549cee7c5102e440be8a61..6b7d547acb986990482ed5cd4f2a30db7fcff56e 100644 (file)
--- a/tests/deal.II/no_flux_05.cc
+++ b/tests/deal.II/no_flux_05.cc
@@ -57,7 +57,7 @@ void test (const Triangulation<dim>& tr,
              << ", case=" << i
              << std::endl;
 
-      std::set<types::boundary_id_t> boundary_ids;
+      std::set<types::boundary_id> boundary_ids;
       for (unsigned int j=0; j<=i; ++j)
        boundary_ids.insert (j);
 

diff --git a/tests/deal.II/no_flux_06.cc b/tests/deal.II/no_flux_06.cc
index ea57693a52a327b7a7e99e94b294fb14a5a9ef72..1bb8df815cb4fe15a783924f9634abfc68801e63 100644 (file)
--- a/tests/deal.II/no_flux_06.cc
+++ b/tests/deal.II/no_flux_06.cc
@@ -48,7 +48,7 @@ void test_hyper_cube()
   deallog << "FE=" << fe.get_name()
          << std::endl;
 
-  std::set<types::boundary_id_t> boundary_ids;
+  std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert (1);
   boundary_ids.insert (3);
   

diff --git a/tests/deal.II/no_flux_07.cc b/tests/deal.II/no_flux_07.cc
index a185202c5fa72a38d337e8f1962239198eb43f78..dacd22392c8e39b6b4f087e88fe3b0b9d8995af3 100644 (file)
--- a/tests/deal.II/no_flux_07.cc
+++ b/tests/deal.II/no_flux_07.cc
@@ -47,7 +47,7 @@ void test (const Triangulation<dim>& tr,
   DoFHandler<dim> dof(tr);
   dof.distribute_dofs(fe);
 
-  std::set<types::boundary_id_t> boundary_ids;
+  std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert (0);
 
   ConstraintMatrix cm;

diff --git a/tests/deal.II/no_flux_08.cc b/tests/deal.II/no_flux_08.cc
index 57dc46c2291d71d0bce12b8acfdf547d037babda..d453b05a5e3ee072f2405246d9c254d419623af3 100644 (file)
--- a/tests/deal.II/no_flux_08.cc
+++ b/tests/deal.II/no_flux_08.cc
@@ -15,7 +15,7 @@
 // we used to get this crash:
 //
 // An error occurred in line <4646> of file </w/heister/deal-trunk/deal.II/include/deal.II/numerics/vectors.templates.h> in function
-//     static void dealii::VectorTools::compute_no_normal_flux_constraints(const DH<dim, spacedim>&, unsigned int, const std::set<types::boundary_id_t>&, dealii::ConstraintMatrix&, const dealii::Mapping<dim, spacedim>&) [with int dim = 3, DH = dealii::DoFHandler, int spacedim = 3]
+//     static void dealii::VectorTools::compute_no_normal_flux_constraints(const DH<dim, spacedim>&, unsigned int, const std::set<types::boundary_id>&, dealii::ConstraintMatrix&, const dealii::Mapping<dim, spacedim>&) [with int dim = 3, DH = dealii::DoFHandler, int spacedim = 3]
 // The violated condition was:
 //     std::fabs (tangent.norm()-1) < 1e-12
 // The name and call sequence of the exception was:
@@ -55,7 +55,7 @@ check ()
 
   dofh.distribute_dofs (fe);
 
-  std::set<types::boundary_id_t> no_normal_flux_boundaries;
+  std::set<types::boundary_id> no_normal_flux_boundaries;
   no_normal_flux_boundaries.insert (0);
   VectorTools::compute_no_normal_flux_constraints (dofh, 0, no_normal_flux_boundaries, cm, mapping);
 

diff --git a/tests/deal.II/no_flux_09.cc b/tests/deal.II/no_flux_09.cc
index ee1736d86092a38eecdc63774616d10e623e60d7..6bb2b86089e6ed18691571bd527ffd7abbd103c5 100644 (file)
--- a/tests/deal.II/no_flux_09.cc
+++ b/tests/deal.II/no_flux_09.cc
@@ -53,7 +53,7 @@ check ()
 
   dofh.distribute_dofs (fe);
 
-  std::set<types::boundary_id_t> no_normal_flux_boundaries;
+  std::set<types::boundary_id> no_normal_flux_boundaries;
   no_normal_flux_boundaries.insert (1);
   //  no_normal_flux_boundaries.insert (2); // not required for the crash for now, please test with it later!
   no_normal_flux_boundaries.insert (3);

diff --git a/tests/deal.II/no_flux_hp_01.cc b/tests/deal.II/no_flux_hp_01.cc
index e5f6faff6831b3eb7f3b6de77f56275883336593..abe5c93ba06764eb2c5c45de449319a4faaede86 100644 (file)
--- a/tests/deal.II/no_flux_hp_01.cc
+++ b/tests/deal.II/no_flux_hp_01.cc
@@ -32,7 +32,7 @@ void test (const Triangulation<dim>& tr,
              << ", case=" << i
              << std::endl;
 
-      std::set<types::boundary_id_t> boundary_ids;
+      std::set<types::boundary_id> boundary_ids;
       for (unsigned int j=0; j<=i; ++j)
        boundary_ids.insert (j);
       

diff --git a/tests/deal.II/no_flux_hp_02.cc b/tests/deal.II/no_flux_hp_02.cc
index eb728be9f39f58b9903b1ff1624178fffec8501e..1e2938aaa6140858638389ce3b84d623f47b0134 100644 (file)
--- a/tests/deal.II/no_flux_hp_02.cc
+++ b/tests/deal.II/no_flux_hp_02.cc
@@ -35,7 +35,7 @@ void test (const Triangulation<dim>& tr,
              << ", case=" << i
              << std::endl;
 
-      std::set<types::boundary_id_t> boundary_ids;
+      std::set<types::boundary_id> boundary_ids;
       for (unsigned int j=0; j<=i; ++j)
        boundary_ids.insert (j);
       

diff --git a/tests/deal.II/no_flux_hp_03.cc b/tests/deal.II/no_flux_hp_03.cc
index 9ea958077872e0d85020e6699f7b1fa1c1106a22..d46089e471032517a7d934d783a03f69e3710cdd 100644 (file)
--- a/tests/deal.II/no_flux_hp_03.cc
+++ b/tests/deal.II/no_flux_hp_03.cc
@@ -32,7 +32,7 @@ void test (const Triangulation<dim>& tr,
   deallog << "FE=" << fe[0].get_name()
          << std::endl;
 
-  std::set<types::boundary_id_t> boundary_ids;
+  std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert (0);
       
   ConstraintMatrix cm;

diff --git a/tests/deal.II/no_flux_hp_04.cc b/tests/deal.II/no_flux_hp_04.cc
index 85f9664b1b0ea0b1b13efab08d29dfcf9903e9df..d9f149769c680c47e5d77340be7b4f026ce34615 100644 (file)
--- a/tests/deal.II/no_flux_hp_04.cc
+++ b/tests/deal.II/no_flux_hp_04.cc
@@ -65,7 +65,7 @@ void test (const Triangulation<dim>& tr,
   deallog << "FE=" << fe[0].get_name()
          << std::endl;
 
-  std::set<types::boundary_id_t> boundary_ids;
+  std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert (0);
 
   ConstraintMatrix cm;

diff --git a/tests/deal.II/no_flux_hp_05.cc b/tests/deal.II/no_flux_hp_05.cc
index 545caa40c7c04dcddc9ffc80398bf564c0d5df81..b9d411b26cf6d7adc246a6afc5b38174b6efa46f 100644 (file)
--- a/tests/deal.II/no_flux_hp_05.cc
+++ b/tests/deal.II/no_flux_hp_05.cc
@@ -45,7 +45,7 @@ void test (const Triangulation<dim>& tr,
              << ", case=" << i
              << std::endl;
 
-      std::set<types::boundary_id_t> boundary_ids;
+      std::set<types::boundary_id> boundary_ids;
       for (unsigned int j=0; j<=i; ++j)
        boundary_ids.insert (j);
 

diff --git a/tests/deal.II/project_boundary_rt_01.cc b/tests/deal.II/project_boundary_rt_01.cc
index 93637960b3b5534d11bc63ede7a8f9bee0cf411e..8a9157f0d7cb1845caebfb9fe8ff4d4df417db39 100644 (file)
--- a/tests/deal.II/project_boundary_rt_01.cc
+++ b/tests/deal.II/project_boundary_rt_01.cc
@@ -134,7 +134,7 @@ void test_projection (const Triangulation<dim>& tr,
   TestFunction<dim> f(degree-1);
   std::map<unsigned int, double> boundary_constraints;
   typename FunctionMap<dim>::type boundary_map;
-  for (types::boundary_id_t i=0;i<255;++i)
+  for (types::boundary_id i=0;i<255;++i)
     boundary_map[i] = &f;
   VectorTools::project_boundary_values(mapping, dof, boundary_map, quadrature,
                                       boundary_constraints);

diff --git a/tests/deal.II/vertex_as_face_08.cc b/tests/deal.II/vertex_as_face_08.cc
index eba87370b879c4a8f1693d40d6a81ba5a57ddfd2..bcf2236adda7a1b77aa4aa791c34a12cc4cdd75e 100644 (file)
--- a/tests/deal.II/vertex_as_face_08.cc
+++ b/tests/deal.II/vertex_as_face_08.cc
@@ -31,7 +31,7 @@ void test ()
   GridGenerator::hyper_cube (tria);
   tria.refine_global (2);
 
-  std::vector<types::boundary_id_t>
+  std::vector<types::boundary_id>
     boundary_ids = tria.get_boundary_indicators ();
 
   for (unsigned int i=0; i<boundary_ids.size(); ++i)

diff --git a/tests/deal.II/vertex_as_face_10.cc b/tests/deal.II/vertex_as_face_10.cc
index 22b8afa14b6b4f9bcfe17aff3aecf030ec3cbf21..2297c3ab00577c06b601f6823092bb0cb559f1d8 100644 (file)
--- a/tests/deal.II/vertex_as_face_10.cc
+++ b/tests/deal.II/vertex_as_face_10.cc
@@ -33,7 +33,7 @@ void test ()
   tria.begin_active()->face(0)->set_boundary_indicator(2);
   tria.begin_active()->face(1)->set_boundary_indicator(4);
 
-  std::vector<types::boundary_id_t>
+  std::vector<types::boundary_id>
     boundary_ids = tria.get_boundary_indicators ();
 
   for (unsigned int i=0; i<boundary_ids.size(); ++i)

diff --git a/tests/fe/abf_01.cc b/tests/fe/abf_01.cc
index d31171fec5a5f29376d52157b75e7d004fd7afac..b13f7f61b5a215e1cbfeae0d7534f58a9eb92b54 100644 (file)
--- a/tests/fe/abf_01.cc
+++ b/tests/fe/abf_01.cc
@@ -493,7 +493,7 @@ void project (const Mapping<dim>       &mapping,
                                         // @p{function} to hold on all parts of the
                                         // boundary
        typename FunctionMap<dim>::type boundary_functions;
-       for (types::boundary_id_t c=0; c<255; ++c)
+       for (types::boundary_id c=0; c<255; ++c)
          boundary_functions[c] = &function;
        project_boundary_values (dof, boundary_functions, q_boundary,
                                 boundary_values);

diff --git a/tests/hp/create_rhs_01.cc b/tests/hp/create_rhs_01.cc
index 78f7674e0e47cd0e1a15d341fc7ce35e0a706884..b961f2fe57f588c2fa1b9a6ecf58d391265533a5 100644 (file)
--- a/tests/hp/create_rhs_01.cc
+++ b/tests/hp/create_rhs_01.cc
@@ -72,8 +72,8 @@ void test ()
   Vector<double> rhs_vector(hp_dof_handler.n_dofs());
   Vector<double> rhs_vector2(hp_dof_handler2.n_dofs());
 
-  types::boundary_id_t myints[1];
-  std::set<types::boundary_id_t> boundary_indicators  (myints,myints+1);  
+  types::boundary_id myints[1];
+  std::set<types::boundary_id> boundary_indicators  (myints,myints+1);  
   myints[0]=0;
   hp::QCollection<1>   quadrature;
   quadrature.push_back (QGauss<1>(1));

diff --git a/tests/mpi/no_flux_constraints.cc b/tests/mpi/no_flux_constraints.cc
index 071b3aa037f8c5fe7dd6402e7c93cc200253ffec..1432e6d9c3f1ab054b8865c5365aaf6c749ebc2e 100644 (file)
--- a/tests/mpi/no_flux_constraints.cc
+++ b/tests/mpi/no_flux_constraints.cc
@@ -106,7 +106,7 @@ void test()
   ConstraintMatrix constraints;
   constraints.reinit(relevant_set);
   DoFTools::make_hanging_node_constraints (dofh, constraints);
-  std::set<types::boundary_id_t> no_normal_flux_boundaries;
+  std::set<types::boundary_id> no_normal_flux_boundaries;
   no_normal_flux_boundaries.insert (1);
   const unsigned int degree = 1;
   VectorTools::compute_no_normal_flux_constraints (dofh, 0,

diff --git a/tests/mpi/no_flux_constraints_02.cc b/tests/mpi/no_flux_constraints_02.cc
index c8d993939462909a7baff052adfe08ff508ffdac..3bde23bcb48996c881b6292dfdeb4b63ea61d913 100644 (file)
--- a/tests/mpi/no_flux_constraints_02.cc
+++ b/tests/mpi/no_flux_constraints_02.cc
@@ -111,7 +111,7 @@ void test()
   ConstraintMatrix constraints;
   constraints.reinit(relevant_set);
   DoFTools::make_hanging_node_constraints (dofh, constraints);
-  std::set<types::boundary_id_t> no_normal_flux_boundaries;
+  std::set<types::boundary_id> no_normal_flux_boundaries;
   no_normal_flux_boundaries.insert (1);
   const unsigned int degree = 1;
 /*  VectorTools::compute_no_normal_flux_constraints (dofh, 0,

diff --git a/tests/mpi/no_flux_constraints_03.cc b/tests/mpi/no_flux_constraints_03.cc
index 386a76375ca1df79f40e154c48d565c4fe7bd71f..f99587e4d12f2676eeb5951664edff6a4d1bbb5f 100644 (file)
--- a/tests/mpi/no_flux_constraints_03.cc
+++ b/tests/mpi/no_flux_constraints_03.cc
@@ -82,7 +82,7 @@ void test()
   ConstraintMatrix constraints;
   constraints.reinit(relevant_set);
   DoFTools::make_hanging_node_constraints (dofh, constraints);
-  std::set<types::boundary_id_t> no_normal_flux_boundaries;
+  std::set<types::boundary_id> no_normal_flux_boundaries;
   no_normal_flux_boundaries.insert (0);
   const unsigned int degree = 1;
   VectorTools::compute_no_normal_flux_constraints (dofh, 0,

diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.cc b/tests/mpi/p4est_2d_constraintmatrix_03.cc
index 8545d9266818feeda2640bb8cfa5c2d1df39b414..fac47937248476b1bc52e70bf888722ab3e6de83 100644 (file)
--- a/tests/mpi/p4est_2d_constraintmatrix_03.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc
@@ -161,7 +161,7 @@ void test()
                                              cm,
                                              velocity_mask);
 
-    std::set<types::boundary_id_t> no_normal_flux_boundaries;
+    std::set<types::boundary_id> no_normal_flux_boundaries;
     no_normal_flux_boundaries.insert (1);