From 2ee45573927f140b949b61d85fe3c155c0f70712 Mon Sep 17 00:00:00 2001 From: wolf Date: Mon, 3 Jan 2000 13:13:37 +0000 Subject: [PATCH] Make this file compilable in 1d as well. git-svn-id: https://svn.dealii.org/trunk@2150 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/numerics/vectors.cc | 46 ++++++++++++---------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/deal.II/deal.II/source/numerics/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index 31335b2def..d5e75e68bb 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -276,11 +276,11 @@ void VectorTools::interpolate (const DoFHandler &dof, template void -VectorTools::interpolate(const DoFHandler &high_dof, - const DoFHandler &low_dof, - const FullMatrix &transfer, - const Vector &high, - Vector &low) +VectorTools::interpolate (const DoFHandler &high_dof, + const DoFHandler &low_dof, + const FullMatrix &transfer, + const Vector &high, + Vector &low) { Vector cell_high(high_dof.get_fe().dofs_per_cell); Vector cell_low(low_dof.get_fe().dofs_per_cell); @@ -966,27 +966,13 @@ void VectorTools::project_boundary_values (const DoFHandler const map*>&, const Quadrature&, map &); -template -void VectorTools::interpolate_boundary_values (const DoFHandler &, - const unsigned char, - const Function &, - map &, - const vector &); + template void VectorTools::create_right_hand_side (const DoFHandler &, const Quadrature &, const Function &, Vector &); template -void VectorTools::project (const DoFHandler &, - const ConstraintMatrix &, - const Quadrature &, - const Function &, - Vector &, - const bool, - const Quadrature &, - const bool); -template void VectorTools::interpolate(const DoFHandler &, const DoFHandler &, const FullMatrix &, @@ -996,3 +982,23 @@ template void VectorTools::interpolate (const DoFHandler &, const Function &, Vector &); + +// the following two functions are not derived from a template in 1d +// and thus need no explicit instantiation +#if deal_II_dimension > 1 +template +void VectorTools::interpolate_boundary_values (const DoFHandler &, + const unsigned char, + const Function &, + map &, + const vector &); +template +void VectorTools::project (const DoFHandler &, + const ConstraintMatrix &, + const Quadrature &, + const Function &, + Vector &, + const bool, + const Quadrature &, + const bool); +#endif -- 2.39.5