From bf2e4d5a554095f87c94e4f4d2a16b44ad8c7172 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Thu, 6 Jul 2017 15:27:26 -0600
Subject: [PATCH] Unify the implementation of two functions.

---
 include/deal.II/dofs/dof_renumbering.h | 13 ++-----
 source/dofs/dof_renumbering.cc         | 48 ++++----------------------
 source/dofs/dof_renumbering.inst.in    | 12 +++----
 3 files changed, 15 insertions(+), 58 deletions(-)

diff --git a/include/deal.II/dofs/dof_renumbering.h b/include/deal.II/dofs/dof_renumbering.h
index 42635eba43..094cc4e0be 100644
--- a/include/deal.II/dofs/dof_renumbering.h
+++ b/include/deal.II/dofs/dof_renumbering.h
@@ -614,22 +614,13 @@ namespace DoFRenumbering
    * For finite elements with only one component, or a single non-primitive
    * base element, this function is the identity operation.
    */
-  template <int dim, int spacedim>
+  template <typename DoFHandlerType>
   void
-  component_wise (DoFHandler<dim,spacedim>        &dof_handler,
+  component_wise (DoFHandlerType                  &dof_handler,
                   const std::vector<unsigned int> &target_component
                   = std::vector<unsigned int>());
 
 
-  /**
-   * Sort the degrees of freedom by component. It does the same thing as the
-   * above function.
-   */
-  template <int dim>
-  void
-  component_wise (hp::DoFHandler<dim>             &dof_handler,
-                  const std::vector<unsigned int> &target_component = std::vector<unsigned int> ());
-
   /**
    * Sort the degrees of freedom by component. It does the same thing as the
    * above function, only that it does this for one single level of a
diff --git a/source/dofs/dof_renumbering.cc b/source/dofs/dof_renumbering.cc
index bbaf17d46a..fe2ac84df7 100644
--- a/source/dofs/dof_renumbering.cc
+++ b/source/dofs/dof_renumbering.cc
@@ -496,23 +496,23 @@ namespace DoFRenumbering
 
 
 
-  template <int dim, int spacedim>
+  template <typename DoFHandlerType>
   void
-  component_wise (DoFHandler<dim,spacedim>        &dof_handler,
+  component_wise (DoFHandlerType                  &dof_handler,
                   const std::vector<unsigned int> &component_order_arg)
   {
     std::vector<types::global_dof_index> renumbering (dof_handler.n_locally_owned_dofs(),
                                                       numbers::invalid_dof_index);
 
-    typename DoFHandler<dim,spacedim>::active_cell_iterator
+    typename DoFHandlerType::active_cell_iterator
     start = dof_handler.begin_active();
-    const typename DoFHandler<dim,spacedim>::level_cell_iterator
+    const typename DoFHandlerType::level_cell_iterator
     end = dof_handler.end();
 
     const types::global_dof_index result =
-      compute_component_wise<dim,spacedim,
-      typename DoFHandler<dim,spacedim>::active_cell_iterator,
-      typename DoFHandler<dim,spacedim>::level_cell_iterator>
+      compute_component_wise<DoFHandlerType::dimension,DoFHandlerType::space_dimension,
+      typename DoFHandlerType::active_cell_iterator,
+      typename DoFHandlerType::level_cell_iterator>
       (renumbering, start, end, component_order_arg, false);
     if (result == 0)
       return;
@@ -532,40 +532,6 @@ namespace DoFRenumbering
             ExcRenumberingIncomplete());
 
     dof_handler.renumber_dofs (renumbering);
-
-    // for (unsigned int level=0;level<dof_handler.get_triangulation().n_levels();++level)
-    //   if (dof_handler.n_dofs(level) != numbers::invalid_dof_index)
-    //  component_wise(dof_handler, level, component_order_arg);
-  }
-
-
-
-  template <int dim>
-  void
-  component_wise (hp::DoFHandler<dim>             &dof_handler,
-                  const std::vector<unsigned int> &component_order_arg)
-  {
-//TODO: Merge with previous function
-    std::vector<types::global_dof_index> renumbering (dof_handler.n_dofs(),
-                                                      numbers::invalid_dof_index);
-
-    typename hp::DoFHandler<dim>::active_cell_iterator
-    start = dof_handler.begin_active();
-    const typename hp::DoFHandler<dim>::level_cell_iterator
-    end = dof_handler.end();
-
-    const types::global_dof_index result =
-      compute_component_wise<hp::DoFHandler<dim>::dimension,hp::DoFHandler<dim>::space_dimension,
-      typename hp::DoFHandler<dim>::active_cell_iterator,
-      typename hp::DoFHandler<dim>::level_cell_iterator>
-      (renumbering, start, end, component_order_arg, false);
-
-    if (result == 0) return;
-
-    Assert (result == dof_handler.n_dofs(),
-            ExcRenumberingIncomplete());
-
-    dof_handler.renumber_dofs (renumbering);
   }
 
 
diff --git a/source/dofs/dof_renumbering.inst.in b/source/dofs/dof_renumbering.inst.in
index f3546de3eb..8ba908e2e5 100644
--- a/source/dofs/dof_renumbering.inst.in
+++ b/source/dofs/dof_renumbering.inst.in
@@ -43,10 +43,15 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
      const std::vector<types::global_dof_index>&);
 
     template
-    void component_wise<deal_II_dimension,deal_II_space_dimension>
+    void component_wise<DoFHandler<deal_II_dimension,deal_II_space_dimension> >
     (DoFHandler<deal_II_dimension,deal_II_space_dimension>&,
      const std::vector<unsigned int>&);
 
+    template
+    void component_wise<hp::DoFHandler<deal_II_dimension,deal_II_space_dimension> >
+    (hp::DoFHandler<deal_II_dimension,deal_II_space_dimension>&,
+     const std::vector<unsigned int>&);
+
     template
     void block_wise<deal_II_dimension,deal_II_space_dimension>
     (DoFHandler<deal_II_dimension,deal_II_space_dimension>&);
@@ -149,11 +154,6 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
      const bool,
      const std::vector<types::global_dof_index>&);
 
-    template
-    void component_wise
-    (hp::DoFHandler<deal_II_dimension>&,
-     const std::vector<unsigned int>&);
-
     template
     void component_wise
     (DoFHandler<deal_II_dimension>&,
-- 
2.39.5