From 97c36fe89984027ef22b5ae7d1a62e79591fa146 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Tue, 7 Jan 2020 20:28:52 -0700
Subject: [PATCH] Further simplify instantiations of
 DoFTools::count_dofs_per_component().

---
 source/dofs/dof_tools.inst.in | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/source/dofs/dof_tools.inst.in b/source/dofs/dof_tools.inst.in
index 73b0d4429e..4f8a57dec2 100644
--- a/source/dofs/dof_tools.inst.in
+++ b/source/dofs/dof_tools.inst.in
@@ -43,6 +43,13 @@ for (DoFHandler : DOFHANDLER_TEMPLATES;
       DoFHandler<deal_II_dimension, deal_II_space_dimension>>(
       const DoFHandler<deal_II_dimension, deal_II_space_dimension> &dof_handler,
       const ComponentMask &                                         components);
+
+    template void DoFTools::count_dofs_per_component<
+      DoFHandler<deal_II_dimension, deal_II_space_dimension>>(
+      const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
+      std::vector<types::global_dof_index> &,
+      const bool,
+      const std::vector<unsigned int> &);
 #endif
   }
 
@@ -296,6 +303,7 @@ for (deal_II_dimension : DIMENSIONS)
     DoFTools::locally_relevant_dofs_per_subdomain<
       DoFHandler<deal_II_dimension, deal_II_dimension + 1>>(
       const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &dof_handler);
+
     template std::vector<IndexSet>
     DoFTools::locally_relevant_dofs_per_subdomain<
       hp::DoFHandler<deal_II_dimension, deal_II_dimension + 1>>(
@@ -646,23 +654,6 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
         const BlockMask &,
         std::vector<bool> &);
 
-
-      template void
-      count_dofs_per_component<
-        DoFHandler<deal_II_dimension, deal_II_space_dimension>>(
-        const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
-        std::vector<types::global_dof_index> &,
-        const bool,
-        const std::vector<unsigned int> &);
-
-      template void
-      count_dofs_per_component<
-        hp::DoFHandler<deal_II_dimension, deal_II_space_dimension>>(
-        const hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
-        std::vector<types::global_dof_index> &,
-        const bool,
-        const std::vector<unsigned int> &);
-
       template void
       make_cell_patches<deal_II_dimension, deal_II_space_dimension>(
         SparsityPattern &,
-- 
2.39.5