Remove deprecated version of MGTools::count_dofs_per_component.

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 72bde701ca81ceccb805a2741671ff79d1ac7678..a38e73378176481f40647e62f8820abfea3dcc97 100644 (file)
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -203,6 +203,7 @@ inconvenience this causes.
   - GridTools::create_union_triangulation.
   - GridTools::extract_boundary_mesh.
   - PreconditionBlock::size.
+  - MGTools::count_dofs_per_component.
   <br>
   This release also removes the deprecated class MGDoFHandler. The
   functionality of this class had previously been incorporated into

diff --git a/include/deal.II/multigrid/mg_tools.h b/include/deal.II/multigrid/mg_tools.h
index b02ecd5d954562a763ccc16b7508a507ec1befa5..ce4e0a522d009c6843b0b97ff2502b3ff4795f7d 100644 (file)
--- a/include/deal.II/multigrid/mg_tools.h
+++ b/include/deal.II/multigrid/mg_tools.h
@@ -169,16 +169,6 @@ namespace MGTools
                             const bool only_once = false,
                             std::vector<unsigned int> target_component = std::vector<unsigned int>());
 
-  /**
-   * @deprecated Wrapper for the other function with same name, introduced for
-   * compatibility.
-   */
-  template <int dim, int spacedim>
-  void
-  count_dofs_per_component (const DoFHandler<dim,spacedim> &mg_dof,
-                            std::vector<std::vector<types::global_dof_index> > &result,
-                            std::vector<unsigned int> target_component) DEAL_II_DEPRECATED;
-
   /**
    * Generate a list of those degrees of freedom at the boundary of the domain
    * that should be eliminated from the matrix because they will be

diff --git a/source/multigrid/mg_tools.cc b/source/multigrid/mg_tools.cc
index 3d12ef7f92e38ace9afac678eea77391b2f066fe..d23cf4a6d342e584d03f75aa55e99a8e6490bb6e 100644 (file)
--- a/source/multigrid/mg_tools.cc
+++ b/source/multigrid/mg_tools.cc
@@ -1059,18 +1059,6 @@ namespace MGTools
 
 
 
-  template <int dim, int spacedim>
-  void
-  count_dofs_per_component (const DoFHandler<dim,spacedim>        &dof_handler,
-                            std::vector<std::vector<types::global_dof_index> > &result,
-                            std::vector<unsigned int>            target_component)
-  {
-    count_dofs_per_component (dof_handler, result,
-                              false, target_component);
-  }
-
-
-
   template <class DH>
   void
   count_dofs_per_block (

diff --git a/source/multigrid/mg_tools.inst.in b/source/multigrid/mg_tools.inst.in
index f3aa07f5b19c1a4a33e3aeef5fabd4d50591e719..8a5981891ff757d1453b584fb4bc70997f11031e 100644 (file)
--- a/source/multigrid/mg_tools.inst.in
+++ b/source/multigrid/mg_tools.inst.in
@@ -84,9 +84,6 @@ for (deal_II_dimension : DIMENSIONS)
       template void count_dofs_per_component (
        const DoFHandler<deal_II_dimension>&, std::vector<std::vector<types::global_dof_index> >&,
        bool, std::vector<unsigned int>);
-      template void count_dofs_per_component (
-       const DoFHandler<deal_II_dimension>&, std::vector<std::vector<types::global_dof_index> >&,
-       std::vector<unsigned int>);
       template void count_dofs_per_block (
        const DoFHandler<deal_II_dimension>&, std::vector<std::vector<types::global_dof_index> >&,
        std::vector<unsigned int>);