Instantiate some more functions for the codim-1 case.

While there, also simplify the file slightly.

diff --git a/source/dofs/dof_tools.inst.in b/source/dofs/dof_tools.inst.in
index ac51e0fae9c9682adf02cb9b9c31162399db7f3f..4b606adb3093d06b75fbef8d280489cdded6901f 100644 (file)
--- a/source/dofs/dof_tools.inst.in
+++ b/source/dofs/dof_tools.inst.in
@@ -14,49 +14,39 @@
 // ---------------------------------------------------------------------
 
 
-for (deal_II_dimension : DIMENSIONS)
+for (DoFHandler : DOFHANDLER_TEMPLATES; deal_II_dimension, deal_II_space_dimension : DIMENSIONS)
 {
 
-#if deal_II_dimension > 1
-    template
-    void
-    DoFTools::extract_locally_relevant_dofs<DoFHandler<deal_II_dimension-1,deal_II_dimension > >
-    (const DoFHandler<deal_II_dimension-1,deal_II_dimension > & dof_handler,
-     IndexSet & dof_set);
+#if deal_II_dimension <= deal_II_space_dimension
     template
     void
-    DoFTools::extract_locally_relevant_level_dofs<DoFHandler<deal_II_dimension-1,deal_II_dimension > >
-    (const DoFHandler<deal_II_dimension-1,deal_II_dimension > & dof_handler,
-     const unsigned int level,
+    DoFTools::extract_locally_relevant_dofs<DoFHandler<deal_II_dimension,deal_II_space_dimension > >
+    (const DoFHandler<deal_II_dimension,deal_II_space_dimension > & dof_handler,
      IndexSet & dof_set);
+
     template
     void
-    DoFTools::extract_locally_relevant_level_dofs<hp::DoFHandler<deal_II_dimension-1,deal_II_dimension > >
-    (const hp::DoFHandler<deal_II_dimension-1,deal_II_dimension > & dof_handler,
+    DoFTools::extract_locally_relevant_level_dofs<DoFHandler<deal_II_dimension,deal_II_space_dimension > >
+    (const DoFHandler<deal_II_dimension,deal_II_space_dimension > & dof_handler,
      const unsigned int level,
      IndexSet & dof_set);
-#endif
 
-#if deal_II_dimension > 2
     template
     void
-    DoFTools::extract_locally_relevant_dofs<DoFHandler<deal_II_dimension-2,deal_II_dimension > >
-    (const DoFHandler<deal_II_dimension-2,deal_II_dimension > & dof_handler,
-     IndexSet & dof_set);
-    template
-    void
-    DoFTools::extract_locally_relevant_level_dofs<DoFHandler<deal_II_dimension-2,deal_II_dimension > >
-    (const DoFHandler<deal_II_dimension-2,deal_II_dimension > & dof_handler,
-     const unsigned int level,
+    DoFTools::extract_locally_owned_dofs<DoFHandler<deal_II_dimension,deal_II_space_dimension> >
+    (const DoFHandler<deal_II_dimension,deal_II_space_dimension> & dof_handler,
      IndexSet & dof_set);
+
     template
     void
-    DoFTools::extract_locally_relevant_level_dofs<hp::DoFHandler<deal_II_dimension-2,deal_II_dimension > >
-    (const hp::DoFHandler<deal_II_dimension-2,deal_II_dimension > & dof_handler,
-     const unsigned int level,
+    DoFTools::extract_locally_active_dofs<DoFHandler<deal_II_dimension,deal_II_space_dimension> >
+    (const DoFHandler<deal_II_dimension,deal_II_space_dimension> & dof_handler,
      IndexSet & dof_set);
 #endif
+}
 
+for (deal_II_dimension : DIMENSIONS)
+{
     template
     std::vector<unsigned int>
     DoFTools::make_vertex_patches (SparsityPattern&, const DoFHandler<deal_II_dimension>&,
@@ -210,56 +200,6 @@ for (deal_II_dimension : DIMENSIONS)
      const types::subdomain_id subdomain_id,
      std::vector<bool>     &selected_dofs);
 
-    template
-    void
-    DoFTools::extract_locally_owned_dofs<DoFHandler<deal_II_dimension> >
-    (const DoFHandler<deal_II_dimension> & dof_handler,
-     IndexSet & dof_set);
-
-    template
-    void
-    DoFTools::extract_locally_owned_dofs<hp::DoFHandler<deal_II_dimension> >
-    (const hp::DoFHandler<deal_II_dimension> & dof_handler,
-     IndexSet & dof_set);
-
-    template
-    void
-    DoFTools::extract_locally_active_dofs<DoFHandler<deal_II_dimension> >
-    (const DoFHandler<deal_II_dimension> & dof_handler,
-     IndexSet & dof_set);
-
-    template
-    void
-    DoFTools::extract_locally_active_dofs<hp::DoFHandler<deal_II_dimension> >
-    (const hp::DoFHandler<deal_II_dimension> & dof_handler,
-     IndexSet & dof_set);
-
-    template
-    void
-    DoFTools::extract_locally_relevant_dofs<DoFHandler<deal_II_dimension> >
-    (const DoFHandler<deal_II_dimension> & dof_handler,
-     IndexSet & dof_set);
-
-    template
-    void
-    DoFTools::extract_locally_relevant_dofs<hp::DoFHandler<deal_II_dimension> >
-    (const hp::DoFHandler<deal_II_dimension> & dof_handler,
-     IndexSet & dof_set);
-
-    template
-    void
-    DoFTools::extract_locally_relevant_level_dofs<DoFHandler<deal_II_dimension> >
-    (const DoFHandler<deal_II_dimension> & dof_handler,
-     const unsigned int level,
-     IndexSet & dof_set);
-
-    template
-    void
-    DoFTools::extract_locally_relevant_level_dofs<hp::DoFHandler<deal_II_dimension> >
-    (const hp::DoFHandler<deal_II_dimension> & dof_handler,
-     const unsigned int level,
-     IndexSet & dof_set);
-
     template
     void
     DoFTools::extract_constant_modes<DoFHandler<deal_II_dimension> >