From 8ee792c140282637a58ccf096a884336a5898834 Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Thu, 25 Jun 2020 08:25:59 +0200 Subject: [PATCH] Make instantiation in dof_accessor.inst.in more systematic --- source/dofs/dof_accessor.inst.in | 97 ++++++++++---------------------- 1 file changed, 29 insertions(+), 68 deletions(-) diff --git a/source/dofs/dof_accessor.inst.in b/source/dofs/dof_accessor.inst.in index 31f8375378..a0de38911b 100644 --- a/source/dofs/dof_accessor.inst.in +++ b/source/dofs/dof_accessor.inst.in @@ -15,88 +15,49 @@ -// TODO: This could surely be made more systematic! -for (deal_II_dimension : DIMENSIONS; lda : BOOL) +for (deal_II_struct_dimension : DIMENSIONS; deal_II_dimension : DIMENSIONS; + deal_II_space_dimension : DIMENSIONS; + lda : BOOL) { - // explicit instantiations (for DoFHandler) - - -#if deal_II_dimension == 2 - template class DoFAccessor<1, 2, 2, lda>; - - template class TriaRawIterator>; - template class TriaIterator>; - template class TriaActiveIterator>; -#endif - -#if deal_II_dimension == 3 - template class DoFAccessor<1, 3, 3, lda>; - template class DoFAccessor<2, 3, 3, lda>; - - template class TriaRawIterator>; - template class TriaIterator>; - template class TriaActiveIterator>; - template class TriaRawIterator>; - template class TriaIterator>; - template class TriaActiveIterator>; -#endif - - template class DoFAccessor; - template class DoFCellAccessor; - - template class TriaRawIterator< - DoFCellAccessor>; - template class TriaIterator< - DoFCellAccessor>; - template class TriaActiveIterator< - DoFCellAccessor>; - - - - // // - // -------------------------------------------------------------------------- - // // explicit instantiations (for DoFHandler) - -#if deal_II_dimension == 1 - template class DoFAccessor<1, 1, 2, lda>; -#endif - -#if deal_II_dimension == 2 - template class DoFAccessor<1, 2, 3, lda>; - template class DoFAccessor<2, 2, 3, lda>; - - template class TriaRawIterator>; - template class TriaIterator>; - template class TriaActiveIterator>; + template class TriaRawIterator>; + template class TriaIterator>; + template class TriaActiveIterator>; #endif + } -#if deal_II_dimension != 3 +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS; + lda : BOOL) + { +#if deal_II_dimension <= deal_II_space_dimension template class DoFCellAccessor; - template class TriaRawIterator< - DoFCellAccessor>; + DoFCellAccessor>; template class TriaIterator< - DoFCellAccessor>; + DoFCellAccessor>; template class TriaActiveIterator< - DoFCellAccessor>; -#endif - - -#if deal_II_dimension == 3 - template class DoFCellAccessor<1, 3, lda>; - - template class TriaRawIterator>; - template class TriaIterator>; - template class TriaActiveIterator>; + DoFCellAccessor>; #endif } + for (deal_II_struct_dimension : DIMENSIONS; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS) { -- 2.39.5