Remove deprecated functions with names like 'boundary_indicator'.

They had previously already been replaced by functions with name 'boundary_id', to
be consistent with the spelling for other attributes such as subdomain_id,
material_id, etc.

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 3eccabe9b812b11d54fcda5be89cfaa0190e13b0..8795b503997cd55797eaee1c5a62ae52ee2ec28c 100644 (file)
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -38,6 +38,15 @@ inconvenience this causes.
 </p>
 
 <ol>
+  <li> Removed: Functions with names containing <code>boundary_indicator</code>
+  have been removed. They had previously already been deprecated, and replaced
+  by functions containing the string <code>boundary_id</code> instead, to keep
+  with the style used for <code>material_id</code>, <code>subdomain_id</code>,
+  etc.
+  <br>
+  (Wolfgang Bangerth, 2016/02/28)
+  </li>
+
   <li> Changed: Many functions in VectorTools and MatrixTools now require
   matching data types between vectors, matrices, and Function arguments.
   <br>

diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h
index cbb1f1d307c4dbe54a484484f1cd7b23c6f776d5..e0405a49342a45e557fd934c3c629b6980876035 100644 (file)
--- a/include/deal.II/grid/tria.h
+++ b/include/deal.II/grid/tria.h
@@ -1696,13 +1696,6 @@ public:
    */
   std::vector<types::boundary_id> get_boundary_ids() const;
 
-  /**
-   * Deprecated spelling of get_boundary_ids().
-   *
-   * @deprecated Use get_boundary_ids() instead.
-   */
-  std::vector<types::boundary_id> get_boundary_indicators() const DEAL_II_DEPRECATED;
-
   /**
    * Returns a vector containing all manifold indicators assigned to the
    * objects of this Triangulation. Note, that each manifold indicator is

diff --git a/include/deal.II/grid/tria_accessor.h b/include/deal.II/grid/tria_accessor.h
index 3800008757a15e518fe7ad819d66c226091c08d1..c9b435483388f9c26d78bf573eea71e8d18b8b0b 100644 (file)
--- a/include/deal.II/grid/tria_accessor.h
+++ b/include/deal.II/grid/tria_accessor.h
@@ -884,14 +884,6 @@ public:
    */
   types::boundary_id boundary_id () const;
 
-  /**
-   * Return the boundary indicator of this object.
-   *
-   * @deprecated This spelling of the function name is deprecated. Use
-   * boundary_id() instead.
-   */
-  types::boundary_id boundary_indicator () const DEAL_II_DEPRECATED;
-
   /**
    * Set the boundary indicator of the current object. The same applies as for
    * the boundary_id() function.
@@ -923,14 +915,6 @@ public:
    */
   void set_boundary_id (const types::boundary_id) const;
 
-  /**
-   * Set the boundary indicator of this object.
-   *
-   * @deprecated This spelling of the function name is deprecated. Use
-   * set_boundary_id() instead.
-   */
-  void set_boundary_indicator (const types::boundary_id) const DEAL_II_DEPRECATED;
-
   /**
    * Do as set_boundary_id() but also set the boundary indicators of the
    * objects that bound the current object. For example, in 3d, if
@@ -963,14 +947,6 @@ public:
    */
   void set_all_boundary_ids (const types::boundary_id) const;
 
-  /**
-   * Set the boundary indicator of this object and all that bound it.
-   *
-   * @deprecated This spelling of the function name is deprecated. Use
-   * set_all_boundary_ids() instead.
-   */
-  void set_all_boundary_indicators (const types::boundary_id) const DEAL_II_DEPRECATED;
-
   /**
    * Return whether this object is at the boundary. Obviously, the use of this
    * function is only possible for <tt>dim@>structdim</tt>; however, for
@@ -2064,14 +2040,6 @@ public:
    */
   types::boundary_id boundary_id () const;
 
-  /**
-   * Return the boundary indicator of this object.
-   *
-   * @deprecated This spelling of the function name is deprecated. Use
-   * boundary_id() instead.
-   */
-  types::boundary_id boundary_indicator () const DEAL_II_DEPRECATED;
-
   /**
    * Return the manifold indicator of this object.
    *
@@ -2207,14 +2175,6 @@ public:
   void
   set_boundary_id (const types::boundary_id);
 
-  /**
-   * Set the boundary indicator of this object.
-   *
-   * @deprecated This spelling of the function name is deprecated. Use
-   * set_boundary_id() instead.
-   */
-  void set_boundary_indicator (const types::boundary_id) DEAL_II_DEPRECATED;
-
   /**
    * Set the manifold indicator of this vertex. This does nothing so far since
    * manifolds are only used to refine and map objects, but vertices are not
@@ -2238,14 +2198,6 @@ public:
   void
   set_all_boundary_ids (const types::boundary_id);
 
-  /**
-   * Set the boundary indicator of this object and all that bound it.
-   *
-   * @deprecated This spelling of the function name is deprecated. Use
-   * set_all_boundary_ids() instead.
-   */
-  void set_all_boundary_indicators (const types::boundary_id) DEAL_II_DEPRECATED;
-
   /**
    * Set the manifold indicator of this object and all of its lower-
    * dimensional sub-objects.  Since this object only represents a single

diff --git a/include/deal.II/grid/tria_accessor.templates.h b/include/deal.II/grid/tria_accessor.templates.h
index 031e86d7702b03d62dda792d3750ab0f52f94a7c..2c3de29894313ea5f41d9250d42f221c801f10c9 100644 (file)
--- a/include/deal.II/grid/tria_accessor.templates.h
+++ b/include/deal.II/grid/tria_accessor.templates.h
@@ -1854,16 +1854,6 @@ TriaAccessor<structdim, dim, spacedim>::boundary_id () const
 
 
 
-template <int structdim, int dim, int spacedim>
-types::boundary_id
-TriaAccessor<structdim, dim, spacedim>::boundary_indicator () const
-{
-  return boundary_id();
-}
-
-
-
-
 template <int structdim, int dim, int spacedim>
 void
 TriaAccessor<structdim, dim, spacedim>::
@@ -1877,16 +1867,6 @@ set_boundary_id (const types::boundary_id boundary_ind) const
 
 
 
-template <int structdim, int dim, int spacedim>
-void
-TriaAccessor<structdim, dim, spacedim>::
-set_boundary_indicator (const types::boundary_id boundary_ind) const
-{
-  set_boundary_id (boundary_ind);
-}
-
-
-
 template <int structdim, int dim, int spacedim>
 void
 TriaAccessor<structdim, dim, spacedim>::
@@ -1915,16 +1895,6 @@ set_all_boundary_ids (const types::boundary_id boundary_ind) const
 
 
 
-template <int structdim, int dim, int spacedim>
-void
-TriaAccessor<structdim, dim, spacedim>::
-set_all_boundary_indicators (const types::boundary_id boundary_ind) const
-{
-  set_all_boundary_ids (boundary_ind);
-}
-
-
-
 template <int structdim, int dim, int spacedim>
 bool
 TriaAccessor<structdim, dim, spacedim>::at_boundary () const
@@ -2772,16 +2742,6 @@ TriaAccessor<0, 1, spacedim>::boundary_id () const
 
 
 
-template <int spacedim>
-inline
-types::boundary_id
-TriaAccessor<0, 1, spacedim>::boundary_indicator () const
-{
-  return boundary_id();
-}
-
-
-
 template <int spacedim>
 inline
 types::manifold_id
@@ -2922,17 +2882,6 @@ TriaAccessor<0, 1, spacedim>::set_boundary_id (const types::boundary_id b)
 
 
 
-template <int spacedim>
-inline
-void
-TriaAccessor<0, 1, spacedim>::set_boundary_indicator (const types::boundary_id b)
-{
-  set_boundary_id (b);
-}
-
-
-
-
 template <int spacedim>
 inline
 void
@@ -2952,15 +2901,6 @@ void TriaAccessor<0, 1, spacedim>::set_all_boundary_ids (const types::boundary_i
 
 
 
-template <int spacedim>
-inline
-void TriaAccessor<0, 1, spacedim>::set_all_boundary_indicators (const types::boundary_id b)
-{
-  set_all_boundary_ids (b);
-}
-
-
-
 template <int spacedim>
 inline
 void TriaAccessor<0, 1, spacedim>::set_all_manifold_ids (const types::manifold_id b)

diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc
index 92225b8e1359f8e7310e7be16656705d8cd6161e..6ad89aa450543e55b77199300dd398341fd297bf 100644 (file)
--- a/source/grid/grid_generator.cc
+++ b/source/grid/grid_generator.cc
@@ -3781,7 +3781,7 @@ namespace GridGenerator
         for (unsigned int f=0; f<4; ++f)
           if (cell->at_boundary(f)
               &&
-              (cell->face(f)->boundary_indicator() != 0))
+              (cell->face(f)->boundary_id() != 0))
             {
               quad.boundary_id = cell->face(f)->boundary_id();
               max_boundary_id = std::max(max_boundary_id, quad.boundary_id);

diff --git a/source/grid/tria.cc b/source/grid/tria.cc
index 3147a4d5c18bde90f11fc0f9e8b42ef4544980af..5e37a357c4131db5994d7fa851fa5d37ab560d88 100644 (file)
--- a/source/grid/tria.cc
+++ b/source/grid/tria.cc
@@ -9007,15 +9007,6 @@ Triangulation<dim, spacedim>::get_boundary_ids () const
 
 
 
-template <int dim, int spacedim>
-std::vector<types::boundary_id>
-Triangulation<dim, spacedim>::get_boundary_indicators () const
-{
-  return get_boundary_ids();
-}
-
-
-
 template <int dim, int spacedim>
 std::vector<types::manifold_id>
 Triangulation<dim, spacedim>::get_manifold_ids () const

diff --git a/tests/fe/mapping_fe_field_real_to_unit_b2_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_b2_curved.cc
index 8b920c584e7cb4be5786200e6d75789f3b091931..0b4d246c2c0dd3fde881428fa78f5b1d2ead849f 100644 (file)
--- a/tests/fe/mapping_fe_field_real_to_unit_b2_curved.cc
+++ b/tests/fe/mapping_fe_field_real_to_unit_b2_curved.cc
@@ -59,7 +59,7 @@ void test_real_to_unit_cell()
   // set the boundary indicator for
   // one face of the single cell
   triangulation.set_boundary (1, boundary);
-  triangulation.begin_active()->face(0)->set_boundary_indicator (1);
+  triangulation.begin_active()->face(0)->set_boundary_id (1);
 
 
   const unsigned int n_points = 5;

diff --git a/tests/fe/mapping_fe_field_real_to_unit_b2_mask.cc b/tests/fe/mapping_fe_field_real_to_unit_b2_mask.cc
index 4649e4b374c532297665dedf705044a9fe22ea22..74169e9aa2b0ec26414bad4bf33947ae7e61ed5d 100644 (file)
--- a/tests/fe/mapping_fe_field_real_to_unit_b2_mask.cc
+++ b/tests/fe/mapping_fe_field_real_to_unit_b2_mask.cc
@@ -55,7 +55,7 @@ void test_real_to_unit_cell()
   // set the boundary indicator for
   // one face of the single cell
   triangulation.set_boundary (1, boundary);
-  triangulation.begin_active()->face(0)->set_boundary_indicator (1);
+  triangulation.begin_active()->face(0)->set_boundary_id (1);
 
 
   const unsigned int n_points = 5;

diff --git a/tests/fe/mapping_fe_field_real_to_unit_b3_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_b3_curved.cc
index 6700f4ceee1413af9e6adc71543eae66a013fb45..68a263a4d8980357fafc2e93df8ae3253b594226 100644 (file)
--- a/tests/fe/mapping_fe_field_real_to_unit_b3_curved.cc
+++ b/tests/fe/mapping_fe_field_real_to_unit_b3_curved.cc
@@ -59,7 +59,7 @@ void test_real_to_unit_cell()
   // set the boundary indicator for
   // one face of the single cell
   triangulation.set_boundary (1, boundary);
-  triangulation.begin_active()->face(0)->set_boundary_indicator (1);
+  triangulation.begin_active()->face(0)->set_boundary_id (1);
 
 
   const unsigned int n_points = 5;

diff --git a/tests/fe/mapping_fe_field_real_to_unit_b4_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_b4_curved.cc
index f4c6527741318ebacba195d99f6b604ead7eda78..a6bc9357701ec9b03d9862556d49d754b8ba20cf 100644 (file)
--- a/tests/fe/mapping_fe_field_real_to_unit_b4_curved.cc
+++ b/tests/fe/mapping_fe_field_real_to_unit_b4_curved.cc
@@ -59,7 +59,7 @@ void test_real_to_unit_cell()
   // set the boundary indicator for
   // one face of the single cell
   triangulation.set_boundary (1, boundary);
-  triangulation.begin_active()->face(0)->set_boundary_indicator (1);
+  triangulation.begin_active()->face(0)->set_boundary_id (1);
 
 
   const unsigned int n_points = 5;

diff --git a/tests/fe/mapping_fe_field_real_to_unit_b5_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_b5_curved.cc
index ac329ad1cda348b4386bbea1e8255d658097ef9a..7de7f49b8a9f509e2a31bac29ab08487e6872559 100644 (file)
--- a/tests/fe/mapping_fe_field_real_to_unit_b5_curved.cc
+++ b/tests/fe/mapping_fe_field_real_to_unit_b5_curved.cc
@@ -59,7 +59,7 @@ void test_real_to_unit_cell()
   // set the boundary indicator for
   // one face of the single cell
   triangulation.set_boundary (1, boundary);
-  triangulation.begin_active()->face(0)->set_boundary_indicator (1);
+  triangulation.begin_active()->face(0)->set_boundary_id (1);
 
 
   const unsigned int n_points = 5;

diff --git a/tests/fe/mapping_fe_field_real_to_unit_q2_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_q2_curved.cc
index a09c2f7451385a9863eda3aadfee80fe74006d48..b5ac41ddbd7bde520b82814d2f48c9bdc28d7f07 100644 (file)
--- a/tests/fe/mapping_fe_field_real_to_unit_q2_curved.cc
+++ b/tests/fe/mapping_fe_field_real_to_unit_q2_curved.cc
@@ -61,7 +61,7 @@ void test_real_to_unit_cell()
   // set the boundary indicator for
   // one face of the single cell
   triangulation.set_boundary (1, boundary);
-  triangulation.begin_active()->face(0)->set_boundary_indicator (1);
+  triangulation.begin_active()->face(0)->set_boundary_id (1);
 
 
   const unsigned int n_points = 5;

diff --git a/tests/fe/mapping_fe_field_real_to_unit_q3_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_q3_curved.cc
index 569911d4720c271b184b79b8055bf909e9a0375c..bae9d4d3ebab8a90d1e270cd935910665542a87b 100644 (file)
--- a/tests/fe/mapping_fe_field_real_to_unit_q3_curved.cc
+++ b/tests/fe/mapping_fe_field_real_to_unit_q3_curved.cc
@@ -61,7 +61,7 @@ void test_real_to_unit_cell()
   // set the boundary indicator for
   // one face of the single cell
   triangulation.set_boundary (1, boundary);
-  triangulation.begin_active()->face(0)->set_boundary_indicator (1);
+  triangulation.begin_active()->face(0)->set_boundary_id (1);
 
 
   const unsigned int n_points = 5;

diff --git a/tests/fe/mapping_fe_field_real_to_unit_q4_curved.cc b/tests/fe/mapping_fe_field_real_to_unit_q4_curved.cc
index 35a69505c97d9c298f64ddfee051ab4b5daa055c..bb334119cfbfa3c1741fc528013f17c8db8958e8 100644 (file)
--- a/tests/fe/mapping_fe_field_real_to_unit_q4_curved.cc
+++ b/tests/fe/mapping_fe_field_real_to_unit_q4_curved.cc
@@ -58,7 +58,7 @@ void test_real_to_unit_cell()
   // set the boundary indicator for
   // one face of the single cell
   triangulation.set_boundary (1, boundary);
-  triangulation.begin_active()->face(0)->set_boundary_indicator (1);
+  triangulation.begin_active()->face(0)->set_boundary_id (1);
 
 
   const unsigned int n_points = 5;

diff --git a/tests/grid/grid_in_msh_02.cc b/tests/grid/grid_in_msh_02.cc
index cb5e575c857a3f4057c12fc4fa8ddda37bc4ac89..17884b955c0b7c13cabbb5298cffe540bc61ed85 100644 (file)
--- a/tests/grid/grid_in_msh_02.cc
+++ b/tests/grid/grid_in_msh_02.cc
@@ -53,7 +53,7 @@ void check_file ()
         {
           if (cell->at_boundary(face))
             deallog << "vertex " << cell->face_index(face)
-                    << " has boundary indicator " << (int)cell->face(face)->boundary_indicator()
+                    << " has boundary indicator " << (int)cell->face(face)->boundary_id()
                     << std::endl;
         }
     }

diff --git a/tests/grid/grid_in_msh_02_13.cc b/tests/grid/grid_in_msh_02_13.cc
index 5669a990e2e547319b94702f2d5c7f1ffbcee095..5461fe8d8e8aa476aa3e764a2519fccf4cf5ca66 100644 (file)
--- a/tests/grid/grid_in_msh_02_13.cc
+++ b/tests/grid/grid_in_msh_02_13.cc
@@ -57,7 +57,7 @@ void check_file ()
         {
           if (cell->at_boundary(face))
             deallog << "vertex " << cell->face_index(face)
-                    << " has boundary indicator " << (int)cell->face(face)->boundary_indicator()
+                    << " has boundary indicator " << (int)cell->face(face)->boundary_id()
                     << std::endl;
         }
     }