From a4284a6d9e4f8549925f4589a6ed5e21ff18764e Mon Sep 17 00:00:00 2001 From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d> Date: Tue, 26 Jun 2012 09:56:54 +0000 Subject: [PATCH] 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 --- deal.II/source/numerics/vectors.inst.in | 163 ++++++------------------ 1 file changed, 39 insertions(+), 124 deletions(-) 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_dimension, VEC, Vector<float>, deal_II_space_dimension> (const DoFHandler<deal_II_dimension, deal_II_space_dimension>&, @@ -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<deal_II_dimension,deal_II_space_dimension> &, - const types::boundary_id_t, - const Function<deal_II_space_dimension> &, - std::map<unsigned int,double> &, - const std::vector<bool> &); + void interpolate_boundary_values + (const Mapping<deal_II_dimension,deal_II_space_dimension> &, + const DH<deal_II_dimension,deal_II_space_dimension> &, + const FunctionMap<deal_II_space_dimension>::type &, + std::map<unsigned int,double> &, + const std::vector<bool> &); template - void interpolate_boundary_values ( - const hp::DoFHandler<deal_II_dimension,deal_II_space_dimension> &, - const types::boundary_id_t, - const Function<deal_II_space_dimension> &, - std::map<unsigned int,double> &, - const std::vector<bool> &); + void interpolate_boundary_values + (const Mapping<deal_II_dimension,deal_II_space_dimension> &, + const DH<deal_II_dimension,deal_II_space_dimension> &, + const types::boundary_id_t, + const Function<deal_II_space_dimension> &, + std::map<unsigned int,double> &, + const std::vector<bool> &); template void interpolate_boundary_values ( - const MGDoFHandler<deal_II_dimension,deal_II_space_dimension> &, + const DH<deal_II_dimension,deal_II_space_dimension> &, const types::boundary_id_t, const Function<deal_II_space_dimension> &, std::map<unsigned int,double> &, const std::vector<bool> &); template - void interpolate_boundary_values ( - const DoFHandler<deal_II_dimension,deal_II_space_dimension> &, - const types::boundary_id_t, - const Function<deal_II_space_dimension> &, - ConstraintMatrix &, - const std::vector<bool> &); - - template - void interpolate_boundary_values ( - const hp::DoFHandler<deal_II_dimension,deal_II_space_dimension> &, - const types::boundary_id_t, - const Function<deal_II_space_dimension> &, - ConstraintMatrix &, - const std::vector<bool> &); - - template - void interpolate_boundary_values ( - const MGDoFHandler<deal_II_dimension,deal_II_space_dimension> &, - const types::boundary_id_t, - const Function<deal_II_space_dimension> &, - ConstraintMatrix &, - const std::vector<bool> &); - - template - void interpolate_boundary_values ( - const Mapping<deal_II_dimension,deal_II_space_dimension> &, - const DoFHandler<deal_II_dimension,deal_II_space_dimension> &, - const FunctionMap<deal_II_space_dimension>::type &, - ConstraintMatrix &, - const std::vector<bool> &); - - template - void interpolate_boundary_values ( - const Mapping<deal_II_dimension,deal_II_space_dimension> &, - const hp::DoFHandler<deal_II_dimension,deal_II_space_dimension> &, - const FunctionMap<deal_II_space_dimension>::type &, - ConstraintMatrix &, - const std::vector<bool> &); + void interpolate_boundary_values + (const DH<deal_II_dimension,deal_II_space_dimension> &, + const FunctionMap<deal_II_space_dimension>::type &, + std::map<unsigned int,double> &, + const std::vector<bool> &); template void interpolate_boundary_values ( const Mapping<deal_II_dimension,deal_II_space_dimension> &, - const MGDoFHandler<deal_II_dimension,deal_II_space_dimension> &, + const DH<deal_II_dimension,deal_II_space_dimension> &, const FunctionMap<deal_II_space_dimension>::type &, ConstraintMatrix &, const std::vector<bool> &); template - void interpolate_boundary_values ( - const DoFHandler<deal_II_dimension,deal_II_space_dimension> &, - const FunctionMap<deal_II_space_dimension>::type &, - ConstraintMatrix &, - const std::vector<bool> &); + void interpolate_boundary_values + (const Mapping<deal_II_dimension,deal_II_space_dimension> &, + const DH<deal_II_dimension,deal_II_space_dimension> &, + const types::boundary_id_t, + const Function<deal_II_space_dimension> &, + ConstraintMatrix &, + const std::vector<bool> &); template void interpolate_boundary_values ( - const hp::DoFHandler<deal_II_dimension,deal_II_space_dimension> &, - const FunctionMap<deal_II_space_dimension>::type &, + const DH<deal_II_dimension,deal_II_space_dimension> &, + const types::boundary_id_t, + const Function<deal_II_space_dimension> &, ConstraintMatrix &, const std::vector<bool> &); template void interpolate_boundary_values ( - const MGDoFHandler<deal_II_dimension,deal_II_space_dimension> &, + const DH<deal_II_dimension,deal_II_space_dimension> &, const FunctionMap<deal_II_space_dimension>::type &, ConstraintMatrix &, const std::vector<bool> &); - template - void interpolate_boundary_values - (const Mapping<deal_II_dimension,deal_II_space_dimension> &, - const DoFHandler<deal_II_dimension,deal_II_space_dimension> &, - const FunctionMap<deal_II_space_dimension>::type &, - std::map<unsigned int,double> &, - const std::vector<bool> &); - - template - void interpolate_boundary_values - (const Mapping<deal_II_dimension,deal_II_space_dimension> &, - const DoFHandler<deal_II_dimension,deal_II_space_dimension> &, - const types::boundary_id_t, - const Function<deal_II_space_dimension> &, - std::map<unsigned int,double> &, - const std::vector<bool> &); - - template - void interpolate_boundary_values - (const Mapping<deal_II_dimension,deal_II_space_dimension> &, - const hp::DoFHandler<deal_II_dimension,deal_II_space_dimension> &, - const types::boundary_id_t, - const Function<deal_II_space_dimension> &, - std::map<unsigned int,double> &, - const std::vector<bool> &); - - template - void interpolate_boundary_values - (const Mapping<deal_II_dimension,deal_II_space_dimension> &, - const MGDoFHandler<deal_II_dimension,deal_II_space_dimension> &, - const types::boundary_id_t, - const Function<deal_II_space_dimension> &, - std::map<unsigned int,double> &, - const std::vector<bool> &); + \} +#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<deal_II_dimension,deal_II_space_dimension> (const Mapping<deal_II_dimension,deal_II_space_dimension> &, @@ -690,33 +632,6 @@ for (deal_II_dimension : DIMENSIONS) const ConstraintMatrix &, Vector<double> &); - template - void interpolate_boundary_values - (const Mapping<deal_II_dimension> &, - const DoFHandler<deal_II_dimension> &, - const types::boundary_id_t, - const Function<deal_II_dimension> &, - ConstraintMatrix &, - const std::vector<bool> &); - - template - void interpolate_boundary_values - (const Mapping<deal_II_dimension> &, - const hp::DoFHandler<deal_II_dimension> &, - const types::boundary_id_t, - const Function<deal_II_dimension> &, - ConstraintMatrix &, - const std::vector<bool> &); - - template - void interpolate_boundary_values - (const Mapping<deal_II_dimension> &, - const MGDoFHandler<deal_II_dimension> &, - const types::boundary_id_t, - const Function<deal_II_dimension> &, - ConstraintMatrix &, - const std::vector<bool> &); - \} } -- 2.39.5