From 121264f82534ed1024fc6380bfb63a94daedd287 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Tue, 7 Jan 2020 20:24:06 -0700
Subject: [PATCH] Simplify the instantiations of
 DoFTools::extract_level_dofs().

---
 source/dofs/dof_tools.inst.in | 70 +++++++++--------------------------
 1 file changed, 18 insertions(+), 52 deletions(-)

diff --git a/source/dofs/dof_tools.inst.in b/source/dofs/dof_tools.inst.in
index d3f3578cae..73b0d4429e 100644
--- a/source/dofs/dof_tools.inst.in
+++ b/source/dofs/dof_tools.inst.in
@@ -112,37 +112,6 @@ for (deal_II_dimension : DIMENSIONS)
       const unsigned int                       component);
 
 
-
-    template void DoFTools::extract_level_dofs<DoFHandler<deal_II_dimension>>(
-      const unsigned int level,
-      const DoFHandler<deal_II_dimension> &,
-      const ComponentMask &,
-      std::vector<bool> &);
-
-    template void DoFTools::extract_level_dofs<DoFHandler<deal_II_dimension>>(
-      const unsigned int level,
-      const DoFHandler<deal_II_dimension> &,
-      const BlockMask &,
-      std::vector<bool> &);
-
-#if deal_II_dimension > 1
-    template void
-    DoFTools::extract_level_dofs<DoFHandler<1, deal_II_dimension>>(
-      const unsigned int level,
-      const DoFHandler<1, deal_II_dimension> &,
-      const BlockMask &,
-      std::vector<bool> &);
-#endif
-
-#if deal_II_dimension > 2
-    template void
-    DoFTools::extract_level_dofs<DoFHandler<2, deal_II_dimension>>(
-      const unsigned int level,
-      const DoFHandler<2, deal_II_dimension> &,
-      const BlockMask &,
-      std::vector<bool> &);
-#endif
-
     template void DoFTools::extract_boundary_dofs<
       DoFHandler<deal_II_dimension>>(const DoFHandler<deal_II_dimension> &,
                                      const ComponentMask &,
@@ -396,27 +365,6 @@ for (deal_II_dimension : DIMENSIONS)
 #endif
 
 
-#if deal_II_dimension < 3
-    template void DoFTools::extract_level_dofs<
-      DoFHandler<deal_II_dimension, deal_II_dimension + 1>>(
-      const unsigned int level,
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &,
-      const ComponentMask &,
-      std::vector<bool> &);
-
-#endif
-
-
-#if deal_II_dimension == 3
-    template void DoFTools::extract_level_dofs<DoFHandler<1, 3>>(
-      const unsigned int level,
-      const DoFHandler<1, 3> &,
-      const ComponentMask &,
-      std::vector<bool> &);
-
-#endif
-
-
     template void DoFTools::count_dofs_per_block<DoFHandler<deal_II_dimension>>(
       const DoFHandler<deal_II_dimension> &,
       std::vector<types::global_dof_index> &,
@@ -681,6 +629,24 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
         const hp::DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
         const BlockMask &);
 
+      // extract_level_dofs() for ComponentMask and BlockMask
+      template void
+      extract_level_dofs<
+        DoFHandler<deal_II_dimension, deal_II_space_dimension>>(
+        const unsigned int level,
+        const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
+        const ComponentMask &,
+        std::vector<bool> &);
+
+      template void
+      extract_level_dofs<
+        DoFHandler<deal_II_dimension, deal_II_space_dimension>>(
+        const unsigned int level,
+        const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
+        const BlockMask &,
+        std::vector<bool> &);
+
+
       template void
       count_dofs_per_component<
         DoFHandler<deal_II_dimension, deal_II_space_dimension>>(
-- 
2.39.5