From: Marc Fehling <mafehling.git@gmail.com>
Date: Fri, 12 Apr 2024 13:35:13 +0000 (+0200)
Subject: Clean up many explicit instantiations.
X-Git-Tag: v9.6.0-rc1~379^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9e4f94e90d34df15a444aa9cad24b5c4787b9a9;p=dealii.git

Clean up many explicit instantiations.
---

diff --git a/source/distributed/fully_distributed_tria.inst.in b/source/distributed/fully_distributed_tria.inst.in
index 1883f1edd6..d2ec56a6be 100644
--- a/source/distributed/fully_distributed_tria.inst.in
+++ b/source/distributed/fully_distributed_tria.inst.in
@@ -14,18 +14,15 @@
 
 
 
-for (deal_II_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
     namespace parallel
     \{
       namespace fullydistributed
       \{
-        template class Triangulation<deal_II_dimension>;
-#if deal_II_dimension < 3
-        template class Triangulation<deal_II_dimension, deal_II_dimension + 1>;
-#endif
-#if deal_II_dimension < 2
-        template class Triangulation<deal_II_dimension, deal_II_dimension + 2>;
+#if deal_II_dimension <= deal_II_space_dimension
+        template class Triangulation<deal_II_dimension,
+                                     deal_II_space_dimension>;
 #endif
       \}
     \}
diff --git a/source/distributed/tria_base.inst.in b/source/distributed/tria_base.inst.in
index 311ee754fd..a9136c157d 100644
--- a/source/distributed/tria_base.inst.in
+++ b/source/distributed/tria_base.inst.in
@@ -14,28 +14,16 @@
 
 
 
-for (deal_II_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
     namespace parallel
     \{
-      template class TriangulationBase<deal_II_dimension>;
-#if deal_II_dimension < 3
+#if deal_II_dimension <= deal_II_space_dimension
       template class TriangulationBase<deal_II_dimension,
-                                       deal_II_dimension + 1>;
-#endif
-#if deal_II_dimension < 2
-      template class TriangulationBase<deal_II_dimension,
-                                       deal_II_dimension + 2>;
-#endif
+                                       deal_II_space_dimension>;
 
-      template class DistributedTriangulationBase<deal_II_dimension>;
-#if deal_II_dimension < 3
-      template class DistributedTriangulationBase<deal_II_dimension,
-                                                  deal_II_dimension + 1>;
-#endif
-#if deal_II_dimension < 2
       template class DistributedTriangulationBase<deal_II_dimension,
-                                                  deal_II_dimension + 2>;
+                                                  deal_II_space_dimension>;
 #endif
     \}
   }
diff --git a/source/dofs/block_info.inst.in b/source/dofs/block_info.inst.in
index 4000d35b82..33e1aa859f 100644
--- a/source/dofs/block_info.inst.in
+++ b/source/dofs/block_info.inst.in
@@ -13,22 +13,14 @@
 // ------------------------------------------------------------------------
 
 
-for (deal_II_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
+#if deal_II_dimension <= deal_II_space_dimension
     template void BlockInfo::initialize(
-      const DoFHandler<deal_II_dimension, deal_II_dimension> &, bool, bool);
+      const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
+      bool,
+      bool);
     template void BlockInfo::initialize_local(
-      const DoFHandler<deal_II_dimension, deal_II_dimension> &);
-
-#if deal_II_dimension < 3
-    template void BlockInfo::initialize(
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &, bool, bool);
-    template void BlockInfo::initialize_local(
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &);
-#endif
-
-#if deal_II_dimension == 3
-    template void BlockInfo::initialize(const DoFHandler<1, 3> &, bool, bool);
-    template void BlockInfo::initialize_local(const DoFHandler<1, 3> &);
+      const DoFHandler<deal_II_dimension, deal_II_space_dimension> &);
 #endif
   }
diff --git a/source/dofs/dof_accessor.inst.in b/source/dofs/dof_accessor.inst.in
index db31f92f6c..b880006cf6 100644
--- a/source/dofs/dof_accessor.inst.in
+++ b/source/dofs/dof_accessor.inst.in
@@ -15,7 +15,7 @@
 
 
 for (deal_II_struct_dimension : DIMENSIONS; deal_II_dimension : DIMENSIONS;
-     deal_II_space_dimension : DIMENSIONS;
+     deal_II_space_dimension : SPACE_DIMENSIONS;
      lda : BOOL)
   {
 #if deal_II_struct_dimension <= deal_II_dimension && \
@@ -40,7 +40,7 @@ for (deal_II_struct_dimension : DIMENSIONS; deal_II_dimension : DIMENSIONS;
   }
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS;
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS;
      lda : BOOL)
   {
 #if deal_II_dimension <= deal_II_space_dimension
@@ -65,7 +65,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS;
 
 
 for (deal_II_struct_dimension : DIMENSIONS; deal_II_dimension : DIMENSIONS;
-     deal_II_space_dimension : DIMENSIONS)
+     deal_II_space_dimension : SPACE_DIMENSIONS)
   {
     template class DoFInvalidAccessor<deal_II_struct_dimension,
                                       deal_II_dimension,
diff --git a/source/dofs/dof_handler.inst.in b/source/dofs/dof_handler.inst.in
index f231958685..dacab2ef94 100644
--- a/source/dofs/dof_handler.inst.in
+++ b/source/dofs/dof_handler.inst.in
@@ -13,7 +13,7 @@
 // ------------------------------------------------------------------------
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
     template class DoFHandler<deal_II_dimension, deal_II_space_dimension>;
diff --git a/source/dofs/dof_tools.inst.in b/source/dofs/dof_tools.inst.in
index 864e81037a..b891f1f3a1 100644
--- a/source/dofs/dof_tools.inst.in
+++ b/source/dofs/dof_tools.inst.in
@@ -389,7 +389,7 @@ for (deal_II_dimension : DIMENSIONS; S : REAL_AND_COMPLEX_SCALARS)
   }
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
     namespace DoFTools
@@ -443,7 +443,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
   }
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
     namespace DoFTools
@@ -490,7 +490,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
 #endif
   }
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if deal_II_dimension >= 2 && (deal_II_dimension <= deal_II_space_dimension)
     namespace DoFTools
diff --git a/source/dofs/dof_tools_sparsity.inst.in b/source/dofs/dof_tools_sparsity.inst.in
index c1778af6d7..ae16225ec8 100644
--- a/source/dofs/dof_tools_sparsity.inst.in
+++ b/source/dofs/dof_tools_sparsity.inst.in
@@ -12,253 +12,90 @@
 //
 // ------------------------------------------------------------------------
 
-for (scalar : REAL_AND_COMPLEX_SCALARS; deal_II_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS;
+     scalar : REAL_AND_COMPLEX_SCALARS)
   {
-    template void DoFTools::make_boundary_sparsity_pattern<deal_II_dimension,
-                                                           deal_II_dimension,
-                                                           scalar>(
-      const DoFHandler<deal_II_dimension>                         &dof,
-      const std::map<types::boundary_id,
-                     const Function<deal_II_dimension, scalar> *> &boundary_ids,
-      const std::vector<types::global_dof_index> &dof_to_boundary_mapping,
-      SparsityPatternBase                        &sparsity);
-
-#if deal_II_dimension < 3
-
-    template void
-    DoFTools::make_boundary_sparsity_pattern<deal_II_dimension,
-                                             deal_II_dimension + 1,
-                                             scalar>(
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &dof,
-      const std::map<types::boundary_id,
-                     const Function<deal_II_dimension + 1, scalar> *>
-                                                 &boundary_ids,
-      const std::vector<types::global_dof_index> &dof_to_boundary_mapping,
-      SparsityPatternBase                        &sparsity);
-
-#endif
-
-#if deal_II_dimension == 1
+#if deal_II_dimension <= deal_II_space_dimension
     template void
     DoFTools::make_boundary_sparsity_pattern<deal_II_dimension,
-                                             deal_II_dimension + 2,
+                                             deal_II_space_dimension,
                                              scalar>(
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 2> &dof,
+      const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
       const std::map<types::boundary_id,
-                     const Function<deal_II_dimension + 2, scalar> *>
-                                                 &boundary_ids,
-      const std::vector<types::global_dof_index> &dof_to_boundary_mapping,
-      SparsityPatternBase                        &sparsity);
-#endif
-  }
-
-for (deal_II_dimension : DIMENSIONS; S : REAL_AND_COMPLEX_SCALARS)
-  {
-    template void
-    DoFTools::make_sparsity_pattern<deal_II_dimension, deal_II_dimension>(
-      const DoFHandler<deal_II_dimension, deal_II_dimension> &dof,
-      SparsityPatternBase                                    &sparsity,
-      const AffineConstraints<S> &,
-      const bool,
-      const types::subdomain_id);
+                     const Function<deal_II_space_dimension, scalar> *> &,
+      const std::vector<types::global_dof_index> &,
+      SparsityPatternBase &);
 
     template void
-    DoFTools::make_sparsity_pattern<deal_II_dimension, deal_II_dimension>(
-      const DoFHandler<deal_II_dimension, deal_II_dimension> &,
-      const Table<2, Coupling> &,
+    DoFTools::make_sparsity_pattern<deal_II_dimension, deal_II_space_dimension>(
+      const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
       SparsityPatternBase &,
-      const AffineConstraints<S> &,
-      const bool,
-      const types::subdomain_id);
-
-    template void
-    DoFTools::make_flux_sparsity_pattern<deal_II_dimension, deal_II_dimension>(
-      const DoFHandler<deal_II_dimension> &dof,
-      SparsityPatternBase                 &sparsity,
-      const AffineConstraints<S> &,
-      const bool,
-      const Table<2, Coupling> &,
-      const Table<2, Coupling> &,
-      const types::subdomain_id,
-      const std::function<bool(
-        const typename DoFHandler<deal_II_dimension>::active_cell_iterator &,
-        const unsigned int)> &);
-
-    template void
-    DoFTools::make_flux_sparsity_pattern<deal_II_dimension, deal_II_dimension>(
-      const DoFHandler<deal_II_dimension> &dof,
-      SparsityPatternBase                 &sparsity,
-      const AffineConstraints<S> &,
-      const bool,
-      const types::subdomain_id);
-
-#if deal_II_dimension < 3
-
-    template void
-    DoFTools::make_sparsity_pattern<deal_II_dimension, deal_II_dimension + 1>(
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &dof,
-      SparsityPatternBase                                        &sparsity,
-      const AffineConstraints<S> &,
+      const AffineConstraints<scalar> &,
       const bool,
       const types::subdomain_id);
 
     template void
-    DoFTools::make_sparsity_pattern<deal_II_dimension, deal_II_dimension + 1>(
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &,
+    DoFTools::make_sparsity_pattern<deal_II_dimension, deal_II_space_dimension>(
+      const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
       const Table<2, Coupling> &,
       SparsityPatternBase &,
-      const AffineConstraints<S> &,
+      const AffineConstraints<scalar> &,
       const bool,
       const types::subdomain_id);
 
     template void DoFTools::make_flux_sparsity_pattern<deal_II_dimension,
-                                                       deal_II_dimension + 1>(
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &dof,
-      SparsityPatternBase                                        &sparsity,
-      const AffineConstraints<S> &,
+                                                       deal_II_space_dimension>(
+      const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
+      SparsityPatternBase &,
+      const AffineConstraints<scalar> &,
       const bool,
       const Table<2, Coupling> &,
       const Table<2, Coupling> &,
       const types::subdomain_id,
       const std::function<bool(
-        const typename DoFHandler<deal_II_dimension, deal_II_dimension + 1>::
+        const typename DoFHandler<deal_II_dimension, deal_II_space_dimension>::
           active_cell_iterator &,
         const unsigned int)> &);
 
     template void DoFTools::make_flux_sparsity_pattern<deal_II_dimension,
-                                                       deal_II_dimension + 1>(
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &dof,
-      SparsityPatternBase                                        &sparsity,
-      const AffineConstraints<S> &,
-      const bool,
-      const types::subdomain_id);
-
-#endif
-
-#if deal_II_dimension == 3
-
-    template void DoFTools::make_sparsity_pattern<1, 3>(
-      const DoFHandler<1, 3> &dof,
-      SparsityPatternBase    &sparsity,
-      const AffineConstraints<S> &,
-      const bool,
-      const types::subdomain_id);
-
-    template void DoFTools::make_sparsity_pattern<1, 3>(
-      const DoFHandler<1, 3> &,
-      const Table<2, Coupling> &,
+                                                       deal_II_space_dimension>(
+      const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
       SparsityPatternBase &,
-      const AffineConstraints<S> &,
-      const bool,
-      const types::subdomain_id);
-
-    template void DoFTools::make_flux_sparsity_pattern<1, 3>(
-      const DoFHandler<1, 3> &dof,
-      SparsityPatternBase    &sparsity,
-      const AffineConstraints<S> &,
-      const bool,
-      const Table<2, Coupling> &,
-      const Table<2, Coupling> &,
-      const types::subdomain_id,
-      const std::function<
-        bool(const typename DoFHandler<1, 3>::active_cell_iterator &,
-             const unsigned int)> &);
-
-    template void DoFTools::make_flux_sparsity_pattern<1, 3>(
-      const DoFHandler<1, 3> &dof,
-      SparsityPatternBase    &sparsity,
-      const AffineConstraints<S> &,
+      const AffineConstraints<scalar> &,
       const bool,
       const types::subdomain_id);
-
 #endif
   }
 
-for (deal_II_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
+#if deal_II_dimension <= deal_II_space_dimension
     template void
-    DoFTools::make_sparsity_pattern<deal_II_dimension, deal_II_dimension>(
-      const DoFHandler<deal_II_dimension, deal_II_dimension> &dof_row,
-      const DoFHandler<deal_II_dimension, deal_II_dimension> &dof_col,
-      SparsityPatternBase                                    &sparsity);
-
-    template void DoFTools::make_boundary_sparsity_pattern<deal_II_dimension,
-                                                           deal_II_dimension>(
-      const DoFHandler<deal_II_dimension> &dof,
-      const std::vector<types::global_dof_index> &,
+    DoFTools::make_sparsity_pattern<deal_II_dimension, deal_II_space_dimension>(
+      const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
+      const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
       SparsityPatternBase &);
 
-    template void
-    DoFTools::make_flux_sparsity_pattern<deal_II_dimension, deal_II_dimension>(
-      const DoFHandler<deal_II_dimension> &dof, SparsityPatternBase &sparsity);
-
-    template void
-    DoFTools::make_flux_sparsity_pattern<deal_II_dimension, deal_II_dimension>(
-      const DoFHandler<deal_II_dimension> &dof,
-      SparsityPatternBase                 &sparsity,
-      const Table<2, Coupling> &,
-      const Table<2, Coupling> &,
-      const types::subdomain_id);
-
-#if deal_II_dimension < 3
-
-    template void DoFTools::make_flux_sparsity_pattern<deal_II_dimension,
-                                                       deal_II_dimension + 1>(
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &dof,
-      SparsityPatternBase                                        &sparsity);
-
-    template void DoFTools::make_flux_sparsity_pattern<deal_II_dimension,
-                                                       deal_II_dimension + 1>(
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &dof,
-      SparsityPatternBase                                        &sparsity,
-      const Table<2, Coupling> &,
-      const Table<2, Coupling> &,
-      const types::subdomain_id);
-
-    template void
-    DoFTools::make_sparsity_pattern<deal_II_dimension, deal_II_dimension + 1>(
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &dof_row,
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &dof_col,
-      SparsityPatternBase                                        &sparsity);
-
     template void
     DoFTools::make_boundary_sparsity_pattern<deal_II_dimension,
-                                             deal_II_dimension + 1>(
-      const DoFHandler<deal_II_dimension, deal_II_dimension + 1> &dof,
+                                             deal_II_space_dimension>(
+      const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
       const std::vector<types::global_dof_index> &,
       SparsityPatternBase &);
 
-#endif
-
-
-#if deal_II_dimension == 3
-
-    template void DoFTools::make_sparsity_pattern<1, 3>(
-      const DoFHandler<1, 3> &dof_row,
-      const DoFHandler<1, 3> &dof_col,
-      SparsityPatternBase    &sparsity);
-
-    template void DoFTools::make_boundary_sparsity_pattern<1, 3>(
-      const DoFHandler<1, 3> &dof,
-      const std::vector<types::global_dof_index> &,
+    template void DoFTools::make_flux_sparsity_pattern<deal_II_dimension,
+                                                       deal_II_space_dimension>(
+      const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
       SparsityPatternBase &);
 
-    template void DoFTools::make_flux_sparsity_pattern<1, 3>(
-      const DoFHandler<1, 3> &dof, SparsityPatternBase &sparsity);
-
-    template void DoFTools::make_flux_sparsity_pattern<1, 3>(
-      const DoFHandler<1, 3> &dof,
-      SparsityPatternBase    &sparsity,
+    template void DoFTools::make_flux_sparsity_pattern<deal_II_dimension,
+                                                       deal_II_space_dimension>(
+      const DoFHandler<deal_II_dimension, deal_II_space_dimension> &,
+      SparsityPatternBase &,
       const Table<2, Coupling> &,
       const Table<2, Coupling> &,
       const types::subdomain_id);
-#endif
-  }
-
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
-  {
-#if deal_II_dimension <= deal_II_space_dimension
     template Table<2, DoFTools::Coupling>
     DoFTools::dof_couplings_from_component_couplings(
       const FiniteElement<deal_II_dimension, deal_II_space_dimension> &fe,
diff --git a/source/fe/fe_pyramid_p.inst.in b/source/fe/fe_pyramid_p.inst.in
index a39cb74561..1c154a6a3b 100644
--- a/source/fe/fe_pyramid_p.inst.in
+++ b/source/fe/fe_pyramid_p.inst.in
@@ -14,7 +14,7 @@
 
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
     template class FE_PyramidPoly<deal_II_dimension, deal_II_space_dimension>;
diff --git a/source/fe/fe_simplex_p.inst.in b/source/fe/fe_simplex_p.inst.in
index fc06967957..673118e853 100644
--- a/source/fe/fe_simplex_p.inst.in
+++ b/source/fe/fe_simplex_p.inst.in
@@ -14,7 +14,7 @@
 
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
     template class FE_SimplexPoly<deal_II_dimension, deal_II_space_dimension>;
diff --git a/source/fe/fe_simplex_p_bubbles.inst.in b/source/fe/fe_simplex_p_bubbles.inst.in
index 3191a06e93..7304d8ef94 100644
--- a/source/fe/fe_simplex_p_bubbles.inst.in
+++ b/source/fe/fe_simplex_p_bubbles.inst.in
@@ -14,7 +14,7 @@
 
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
     template class FE_SimplexP_Bubbles<deal_II_dimension,
diff --git a/source/fe/fe_wedge_p.inst.in b/source/fe/fe_wedge_p.inst.in
index f8caa11e91..d948a3cbc0 100644
--- a/source/fe/fe_wedge_p.inst.in
+++ b/source/fe/fe_wedge_p.inst.in
@@ -14,7 +14,7 @@
 
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
     template class FE_WedgePoly<deal_II_dimension, deal_II_space_dimension>;
diff --git a/source/grid/grid_generator.inst.in b/source/grid/grid_generator.inst.in
index 1ecd90309d..afebbdea9a 100644
--- a/source/grid/grid_generator.inst.in
+++ b/source/grid/grid_generator.inst.in
@@ -235,7 +235,7 @@ for (deal_II_dimension : DIMENSIONS)
 
 
 
-for (deal_II_space_dimension : DIMENSIONS)
+for (deal_II_space_dimension : SPACE_DIMENSIONS)
   {
     namespace GridGenerator
     \{
diff --git a/source/grid/tria_accessor.inst.in b/source/grid/tria_accessor.inst.in
index 53f41038f4..f5ac2be95c 100644
--- a/source/grid/tria_accessor.inst.in
+++ b/source/grid/tria_accessor.inst.in
@@ -15,7 +15,7 @@
 
 
 for (deal_II_struct_dimension : DIMENSIONS; deal_II_dimension : DIMENSIONS;
-     deal_II_space_dimension : DIMENSIONS)
+     deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if deal_II_struct_dimension <= deal_II_dimension && \
   deal_II_dimension <= deal_II_space_dimension
@@ -38,7 +38,7 @@ for (deal_II_struct_dimension : DIMENSIONS; deal_II_dimension : DIMENSIONS;
   }
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
     template class CellAccessor<deal_II_dimension, deal_II_space_dimension>;
@@ -51,14 +51,14 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
 #endif
   }
 
-for (deal_II_space_dimension : DIMENSIONS)
+for (deal_II_space_dimension : SPACE_DIMENSIONS)
   {
     template class TriaAccessor<0, 1, deal_II_space_dimension>;
     template class TriaIterator<TriaAccessor<0, 1, deal_II_space_dimension>>;
   }
 
 for (deal_II_struct_dimension : DIMENSIONS; deal_II_dimension : DIMENSIONS;
-     deal_II_space_dimension : DIMENSIONS)
+     deal_II_space_dimension : SPACE_DIMENSIONS)
   {
     template class InvalidAccessor<deal_II_struct_dimension,
                                    deal_II_dimension,
diff --git a/source/grid/tria_description.inst.in b/source/grid/tria_description.inst.in
index f53a4fefab..62c2c28f08 100644
--- a/source/grid/tria_description.inst.in
+++ b/source/grid/tria_description.inst.in
@@ -14,7 +14,7 @@
 
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
     namespace TriangulationDescription
     \{
diff --git a/source/matrix_free/shape_info.inst.in b/source/matrix_free/shape_info.inst.in
index d013a949e0..2e083723f6 100644
--- a/source/matrix_free/shape_info.inst.in
+++ b/source/matrix_free/shape_info.inst.in
@@ -13,7 +13,7 @@
 // ------------------------------------------------------------------------
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS;
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS;
      deal_II_scalar : REAL_SCALARS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
@@ -56,7 +56,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
 
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS;
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS;
      deal_II_scalar_vectorized : REAL_SCALARS_VECTORIZED)
   {
 #if deal_II_dimension <= deal_II_space_dimension
diff --git a/source/non_matching/quadrature_generator.inst.in b/source/non_matching/quadrature_generator.inst.in
index 4ea3e594c2..8e67b72d22 100644
--- a/source/non_matching/quadrature_generator.inst.in
+++ b/source/non_matching/quadrature_generator.inst.in
@@ -76,7 +76,7 @@ for (deal_II_dimension : DIMENSIONS)
     \}
   }
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if 1 < deal_II_dimension
     template class NonMatching::internal::QuadratureGeneratorImplementation::
diff --git a/source/numerics/data_out.inst.in b/source/numerics/data_out.inst.in
index 5af9f13d6b..2e259b8d4f 100644
--- a/source/numerics/data_out.inst.in
+++ b/source/numerics/data_out.inst.in
@@ -14,29 +14,19 @@
 
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
+#if deal_II_dimension <= deal_II_space_dimension
     namespace internal
     \{
       namespace DataOutImplementation
       \{
-#if deal_II_dimension <= deal_II_space_dimension
+
         template struct ParallelData<deal_II_dimension,
                                      deal_II_space_dimension>;
-#endif
       \}
     \}
-  }
-
-
-for (deal_II_dimension : DIMENSIONS)
-  {
-    template class DataOut<deal_II_dimension>;
-#if deal_II_dimension < 3
-    template class DataOut<deal_II_dimension, deal_II_dimension + 1>;
-#endif
 
-#if deal_II_dimension == 3
-    template class DataOut<1, 3>;
+    template class DataOut<deal_II_dimension, deal_II_space_dimension>;
 #endif
   }
diff --git a/source/numerics/data_out_dof_data_codim.inst.in b/source/numerics/data_out_dof_data_codim.inst.in
index 0259aec89e..bdbc815837 100644
--- a/source/numerics/data_out_dof_data_codim.inst.in
+++ b/source/numerics/data_out_dof_data_codim.inst.in
@@ -14,7 +14,7 @@
 
 
 for (VEC : REAL_VECTOR_TYPES; deal_II_dimension : DIMENSIONS;
-     deal_II_space_dimension : DIMENSIONS)
+     deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if deal_II_dimension < deal_II_space_dimension
     template void DataOut_DoFData<deal_II_dimension,
@@ -70,7 +70,7 @@ for (deal_II_dimension : DIMENSIONS)
   }
 
 
-for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
     namespace internal
     \{
diff --git a/source/numerics/data_out_resample.inst.in b/source/numerics/data_out_resample.inst.in
index 3cdb865af9..2d0a4fd4eb 100644
--- a/source/numerics/data_out_resample.inst.in
+++ b/source/numerics/data_out_resample.inst.in
@@ -14,7 +14,7 @@
 
 
 for (deal_II_dimension : DIMENSIONS; deal_II_patch_dimension : DIMENSIONS;
-     deal_II_space_dimension : DIMENSIONS)
+     deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if deal_II_dimension == deal_II_space_dimension && \
   deal_II_patch_dimension <= deal_II_space_dimension