From ab4753f68681e1a324096d4497dfcdf93983e88d Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Thu, 25 Jun 2020 09:48:37 +0200 Subject: [PATCH] Make instantiation in tria_accessor.inst.in more systematic --- source/grid/tria_accessor.inst.in | 112 +++++++----------------------- 1 file changed, 27 insertions(+), 85 deletions(-) diff --git a/source/grid/tria_accessor.inst.in b/source/grid/tria_accessor.inst.in index eb76c7df2e..2de9bf647a 100644 --- a/source/grid/tria_accessor.inst.in +++ b/source/grid/tria_accessor.inst.in @@ -15,97 +15,39 @@ -for (deal_II_dimension : DIMENSIONS) +for (deal_II_struct_dimension : DIMENSIONS; deal_II_dimension : DIMENSIONS; + deal_II_space_dimension : DIMENSIONS) { - template class TriaAccessorBase<1, deal_II_dimension>; -#if deal_II_dimension >= 2 - template class TriaAccessorBase<2, deal_II_dimension>; +#if deal_II_struct_dimension <= deal_II_dimension && \ + deal_II_dimension <= deal_II_space_dimension + template class TriaAccessorBase; + template class TriaAccessor; + template class TriaRawIterator>; + template class TriaIterator>; + template class TriaActiveIterator>; #endif -#if deal_II_dimension >= 3 - template class TriaAccessorBase<3, deal_II_dimension>; -#endif - - template class TriaAccessor<1, deal_II_dimension, deal_II_dimension>; -#if deal_II_dimension >= 2 - template class TriaAccessor<2, deal_II_dimension, deal_II_dimension>; -#endif -#if deal_II_dimension >= 3 - template class TriaAccessor<3, deal_II_dimension, deal_II_dimension>; -#endif - - - template class CellAccessor; - template class TriaRawIterator< - TriaAccessor<1, deal_II_dimension, deal_II_dimension>>; - template class TriaRawIterator>; - template class TriaIterator< - TriaAccessor<1, deal_II_dimension, deal_II_dimension>>; - template class TriaIterator>; - template class TriaActiveIterator< - TriaAccessor<1, deal_II_dimension, deal_II_dimension>>; - template class TriaActiveIterator>; - - -#if deal_II_dimension >= 2 - template class TriaRawIterator< - TriaAccessor<2, deal_II_dimension, deal_II_dimension>>; - template class TriaIterator< - TriaAccessor<2, deal_II_dimension, deal_II_dimension>>; - template class TriaActiveIterator< - TriaAccessor<2, deal_II_dimension, deal_II_dimension>>; -#endif - -#if deal_II_dimension >= 3 - template class TriaRawIterator< - TriaAccessor<3, deal_II_dimension, deal_II_dimension>>; - template class TriaIterator< - TriaAccessor<3, deal_II_dimension, deal_II_dimension>>; - template class TriaActiveIterator< - TriaAccessor<3, deal_II_dimension, deal_II_dimension>>; - template class CellAccessor<1, 3>; -#endif - -#if deal_II_dimension == 1 - template class TriaAccessorBase<1, deal_II_dimension, 2>; - template class TriaAccessorBase<1, deal_II_dimension, 3>; - - template class TriaAccessor<1, deal_II_dimension, 2>; - template class TriaAccessor<1, deal_II_dimension, 3>; - - -#endif -#if deal_II_dimension == 2 - template class TriaAccessorBase<1, deal_II_dimension, 3>; - template class TriaAccessorBase<2, deal_II_dimension, 3>; - - template class TriaAccessor<1, deal_II_dimension, 3>; - template class TriaAccessor<2, deal_II_dimension, 3>; -#endif - -#if deal_II_dimension != 3 - template class CellAccessor; - template class TriaRawIterator< - TriaAccessor<1, deal_II_dimension, deal_II_dimension + 1>>; - template class TriaRawIterator< - CellAccessor>; - template class TriaIterator< - TriaAccessor<1, deal_II_dimension, deal_II_dimension + 1>>; - template class TriaIterator< - CellAccessor>; - template class TriaActiveIterator< - TriaAccessor<1, deal_II_dimension, deal_II_dimension + 1>>; - template class TriaActiveIterator< - CellAccessor>; + } -# if deal_II_dimension == 2 +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS) + { +#if deal_II_dimension <= deal_II_space_dimension + template class CellAccessor; template class TriaRawIterator< - TriaAccessor<2, deal_II_dimension, deal_II_dimension + 1>>; + CellAccessor>; template class TriaIterator< - TriaAccessor<2, deal_II_dimension, deal_II_dimension + 1>>; + CellAccessor>; template class TriaActiveIterator< - TriaAccessor<2, deal_II_dimension, deal_II_dimension + 1>>; -# endif - + CellAccessor>; #endif } -- 2.39.5