From: Wolfgang Bangerth Date: Wed, 8 Jan 2020 03:42:13 +0000 (-0700) Subject: Simplify the instantiations of DoFTools::extract_dofs(). X-Git-Tag: v9.2.0-rc1~719^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e60931eb51ea901f9c5f30a48718d9d1fe75a62;p=dealii.git Simplify the instantiations of DoFTools::extract_dofs(). --- diff --git a/source/dofs/dof_tools.inst.in b/source/dofs/dof_tools.inst.in index 15c788aa66..b33610e531 100644 --- a/source/dofs/dof_tools.inst.in +++ b/source/dofs/dof_tools.inst.in @@ -70,6 +70,32 @@ for (DoFHandler : DOFHANDLER_TEMPLATES; const DoFHandler &, std::vector &, const std::vector &); + + // extract_dofs(): Deprecated versions that return information through + // the last argument + template void + extract_dofs>( + const DoFHandler &, + const ComponentMask &, + std::vector &); + + template void + extract_dofs>( + const DoFHandler &, + const BlockMask &, + std::vector &); + + + // extract_dofs(): New versions that return information as an IndexSet + template IndexSet + extract_dofs>( + const DoFHandler &, + const ComponentMask &); + + template IndexSet + extract_dofs>( + const DoFHandler &, + const BlockMask &); \} #endif } @@ -567,54 +593,6 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS) deal_II_space_dimension>::active_cell_iterator> &patch); - // Deprecated versions that return information through the last - // argument - template void - extract_dofs>( - const DoFHandler &, - const ComponentMask &, - std::vector &); - - template void - extract_dofs>( - const DoFHandler &, - const BlockMask &, - std::vector &); - - template void - extract_dofs>( - const hp::DoFHandler &, - const ComponentMask &, - std::vector &); - - template void - extract_dofs>( - const hp::DoFHandler &, - const BlockMask &, - std::vector &); - - - // New versions that return information as an IndexSet - template IndexSet - extract_dofs>( - const DoFHandler &, - const ComponentMask &); - - template IndexSet - extract_dofs>( - const DoFHandler &, - const BlockMask &); - - template IndexSet - extract_dofs>( - const hp::DoFHandler &, - const ComponentMask &); - - template IndexSet - extract_dofs>( - const hp::DoFHandler &, - const BlockMask &); - // extract_level_dofs() for ComponentMask and BlockMask template void extract_level_dofs<