From: Timo Heister Date: Sat, 28 Jan 2017 20:36:49 +0000 (-0500) Subject: remove only usage of DOFHANDLERS in .inst.in X-Git-Tag: v8.5.0-rc1~149^2~3 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43388013f8e7850b3f186c137972054e9e635acd;p=dealii.git remove only usage of DOFHANDLERS in .inst.in --- diff --git a/source/dofs/dof_tools_constraints.inst.in b/source/dofs/dof_tools_constraints.inst.in index 6e43b04628..d5873bb030 100644 --- a/source/dofs/dof_tools_constraints.inst.in +++ b/source/dofs/dof_tools_constraints.inst.in @@ -14,20 +14,25 @@ // --------------------------------------------------------------------- - - -for (DH : DOFHANDLERS; deal_II_dimension : DIMENSIONS) +for (DH : DOFHANDLER_TEMPLATES; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS) { +#if deal_II_dimension <= deal_II_space_dimension template void - DoFTools::make_hanging_node_constraints (const DH &dof_handler, - ConstraintMatrix &constraints); + DoFTools::make_hanging_node_constraints ( + const DH &, + ConstraintMatrix &); +#endif +} + +for (DH : DOFHANDLER_TEMPLATES; deal_II_dimension : DIMENSIONS) +{ #if deal_II_dimension != 1 template void - DoFTools::make_periodicity_constraints (const DH::face_iterator &, - const DH::face_iterator &, + DoFTools::make_periodicity_constraints (const DH::face_iterator &, + const DH::face_iterator &, dealii::ConstraintMatrix &, const ComponentMask &, bool, bool, bool, @@ -36,8 +41,8 @@ for (DH : DOFHANDLERS; deal_II_dimension : DIMENSIONS) template void - DoFTools::make_periodicity_constraints - (const std::vector > &, + DoFTools::make_periodicity_constraints > + (const std::vector::cell_iterator> > &, dealii::ConstraintMatrix &, const ComponentMask &, const std::vector &); @@ -45,7 +50,7 @@ for (DH : DOFHANDLERS; deal_II_dimension : DIMENSIONS) template void - DoFTools::make_periodicity_constraints(const DH &, + DoFTools::make_periodicity_constraints(const DH &, const types::boundary_id, const types::boundary_id, const int, @@ -54,7 +59,7 @@ for (DH : DOFHANDLERS; deal_II_dimension : DIMENSIONS) template void - DoFTools::make_periodicity_constraints(const DH &, + DoFTools::make_periodicity_constraints(const DH &, const types::boundary_id, const int, dealii::ConstraintMatrix &, @@ -64,23 +69,6 @@ for (DH : DOFHANDLERS; deal_II_dimension : DIMENSIONS) for (deal_II_dimension : DIMENSIONS) { -#if deal_II_dimension < 3 - - template - void - DoFTools:: - make_hanging_node_constraints (const DoFHandler &dof_handler, - ConstraintMatrix &constraints); -#endif - -#if deal_II_dimension == 3 - template - void - DoFTools:: - make_hanging_node_constraints (const DoFHandler<1,3> &dof_handler, - ConstraintMatrix &constraints); -#endif - template void DoFTools::make_zero_boundary_constraints