From: bangerth Date: Tue, 26 Jun 2012 09:56:54 +0000 (+0000) Subject: Add a missing set of instantiations. Put more things under the template expander... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4284a6d9e4f8549925f4589a6ed5e21ff18764e;p=dealii-svn.git Add a missing set of instantiations. Put more things under the template expander and order them in the same way as the declarations in the .h file. git-svn-id: https://svn.dealii.org/trunk@25642 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/numerics/vectors.inst.in b/deal.II/source/numerics/vectors.inst.in index 19f7655112..f6bf113d36 100644 --- a/deal.II/source/numerics/vectors.inst.in +++ b/deal.II/source/numerics/vectors.inst.in @@ -16,7 +16,6 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens #if deal_II_dimension <= deal_II_space_dimension namespace VectorTools \{ - template void integrate_difference, deal_II_space_dimension> (const DoFHandler&, @@ -283,140 +282,83 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens - -for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; DH : DOFHANDLER_TEMPLATES) { #if deal_II_dimension <= deal_II_space_dimension namespace VectorTools \{ template - void interpolate_boundary_values ( - const DoFHandler &, - const types::boundary_id_t, - const Function &, - std::map &, - const std::vector &); + void interpolate_boundary_values + (const Mapping &, + const DH &, + const FunctionMap::type &, + std::map &, + const std::vector &); template - void interpolate_boundary_values ( - const hp::DoFHandler &, - const types::boundary_id_t, - const Function &, - std::map &, - const std::vector &); + void interpolate_boundary_values + (const Mapping &, + const DH &, + const types::boundary_id_t, + const Function &, + std::map &, + const std::vector &); template void interpolate_boundary_values ( - const MGDoFHandler &, + const DH &, const types::boundary_id_t, const Function &, std::map &, const std::vector &); template - void interpolate_boundary_values ( - const DoFHandler &, - const types::boundary_id_t, - const Function &, - ConstraintMatrix &, - const std::vector &); - - template - void interpolate_boundary_values ( - const hp::DoFHandler &, - const types::boundary_id_t, - const Function &, - ConstraintMatrix &, - const std::vector &); - - template - void interpolate_boundary_values ( - const MGDoFHandler &, - const types::boundary_id_t, - const Function &, - ConstraintMatrix &, - const std::vector &); - - template - void interpolate_boundary_values ( - const Mapping &, - const DoFHandler &, - const FunctionMap::type &, - ConstraintMatrix &, - const std::vector &); - - template - void interpolate_boundary_values ( - const Mapping &, - const hp::DoFHandler &, - const FunctionMap::type &, - ConstraintMatrix &, - const std::vector &); + void interpolate_boundary_values + (const DH &, + const FunctionMap::type &, + std::map &, + const std::vector &); template void interpolate_boundary_values ( const Mapping &, - const MGDoFHandler &, + const DH &, const FunctionMap::type &, ConstraintMatrix &, const std::vector &); template - void interpolate_boundary_values ( - const DoFHandler &, - const FunctionMap::type &, - ConstraintMatrix &, - const std::vector &); + void interpolate_boundary_values + (const Mapping &, + const DH &, + const types::boundary_id_t, + const Function &, + ConstraintMatrix &, + const std::vector &); template void interpolate_boundary_values ( - const hp::DoFHandler &, - const FunctionMap::type &, + const DH &, + const types::boundary_id_t, + const Function &, ConstraintMatrix &, const std::vector &); template void interpolate_boundary_values ( - const MGDoFHandler &, + const DH &, const FunctionMap::type &, ConstraintMatrix &, const std::vector &); - template - void interpolate_boundary_values - (const Mapping &, - const DoFHandler &, - const FunctionMap::type &, - std::map &, - const std::vector &); - - template - void interpolate_boundary_values - (const Mapping &, - const DoFHandler &, - const types::boundary_id_t, - const Function &, - std::map &, - const std::vector &); - - template - void interpolate_boundary_values - (const Mapping &, - const hp::DoFHandler &, - const types::boundary_id_t, - const Function &, - std::map &, - const std::vector &); - - template - void interpolate_boundary_values - (const Mapping &, - const MGDoFHandler &, - const types::boundary_id_t, - const Function &, - std::map &, - const std::vector &); + \} +#endif + } +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) + { +#if deal_II_dimension <= deal_II_space_dimension + namespace VectorTools \{ template void create_right_hand_side (const Mapping &, @@ -690,33 +632,6 @@ for (deal_II_dimension : DIMENSIONS) const ConstraintMatrix &, Vector &); - template - void interpolate_boundary_values - (const Mapping &, - const DoFHandler &, - const types::boundary_id_t, - const Function &, - ConstraintMatrix &, - const std::vector &); - - template - void interpolate_boundary_values - (const Mapping &, - const hp::DoFHandler &, - const types::boundary_id_t, - const Function &, - ConstraintMatrix &, - const std::vector &); - - template - void interpolate_boundary_values - (const Mapping &, - const MGDoFHandler &, - const types::boundary_id_t, - const Function &, - ConstraintMatrix &, - const std::vector &); - \} }