From 3b8b25df98221bc4d535a6859af7752cf1a080ad Mon Sep 17 00:00:00 2001 From: Karl Ljungkvist Date: Wed, 23 Nov 2016 14:46:35 +0100 Subject: [PATCH] make instantiations fulfill chartdim<=spacedim --- source/grid/manifold.inst.in | 14 ++++++++------ source/grid/manifold_lib.inst.in | 11 ++++++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/source/grid/manifold.inst.in b/source/grid/manifold.inst.in index 3cd1d67db9..4f2cea5dc5 100644 --- 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; template class FlatManifold; - - template class ChartManifold; - template class ChartManifold; - template class ChartManifold; #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; +#endif +#endif +} diff --git a/source/grid/manifold_lib.inst.in b/source/grid/manifold_lib.inst.in index 876da5d0ff..cbb1aeae3b 100644 --- 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; template class SphericalManifold; template class CylindricalManifold; - template class FunctionManifold; - template class FunctionManifold; - template class FunctionManifold; #endif #if deal_II_dimension == deal_II_space_dimension template class TorusManifold; #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; +#endif +#endif +} -- 2.39.5