make instantiations fulfill chartdim<=spacedim

diff --git a/source/grid/manifold.inst.in b/source/grid/manifold.inst.in
index 3cd1d67db9eea229dde54a82875a43235d01b95d..4f2cea5dc5885cb548884c7423cf6c42d184816b 100644 (file)
--- a/source/grid/manifold.inst.in
+++ b/source/grid/manifold.inst.in
@@ -20,12 +20,14 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
 #if deal_II_dimension <= deal_II_space_dimension
     template class Manifold<deal_II_dimension, deal_II_space_dimension>;
     template class FlatManifold<deal_II_dimension, deal_II_space_dimension>;
-
-    template class ChartManifold<deal_II_dimension, deal_II_space_dimension, 1>;
-    template class ChartManifold<deal_II_dimension, deal_II_space_dimension, 2>;
-    template class ChartManifold<deal_II_dimension, deal_II_space_dimension, 3>;
 #endif
 }
 
-
-
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS; deal_II_chart_dimension :  DIMENSIONS)
+{
+#if deal_II_dimension <= deal_II_space_dimension
+#if deal_II_chart_dimension <= deal_II_space_dimension
+    template class ChartManifold<deal_II_dimension, deal_II_space_dimension, deal_II_chart_dimension>;
+#endif
+#endif
+}

diff --git a/source/grid/manifold_lib.inst.in b/source/grid/manifold_lib.inst.in
index 876da5d0ff1d3909390417f5f55beecfa66ce6d1..cbb1aeae3bceb60d3866b19632a4e831d3681ffe 100644 (file)
--- a/source/grid/manifold_lib.inst.in
+++ b/source/grid/manifold_lib.inst.in
@@ -20,12 +20,17 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
     template class PolarManifold<deal_II_dimension, deal_II_space_dimension>;
     template class SphericalManifold<deal_II_dimension, deal_II_space_dimension>;
     template class CylindricalManifold<deal_II_dimension, deal_II_space_dimension>;
-    template class FunctionManifold<deal_II_dimension, deal_II_space_dimension, 1>;
-    template class FunctionManifold<deal_II_dimension, deal_II_space_dimension, 2>;
-    template class FunctionManifold<deal_II_dimension, deal_II_space_dimension, 3>;
 #endif
 #if deal_II_dimension == deal_II_space_dimension
     template class TorusManifold<deal_II_dimension>;
 #endif
 }
 
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS; deal_II_chart_dimension :  DIMENSIONS)
+{
+#if deal_II_dimension <= deal_II_space_dimension
+#if deal_II_chart_dimension <= deal_II_space_dimension
+    template class FunctionManifold<deal_II_dimension, deal_II_space_dimension, deal_II_chart_dimension>;
+#endif
+#endif
+}