From: Ralf Hartmann Date: Thu, 5 Apr 2001 13:58:54 +0000 (+0000) Subject: Include typedef FunctionMap into VectorTools. This will be replaced by a globalized... X-Git-Tag: v8.0.0~19401 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08a9207704468d9d5f8607a56f9697b35fb29983;p=dealii.git Include typedef FunctionMap into VectorTools. This will be replaced by a globalized FunctionMap later. Include missing explicite templatizations. git-svn-id: https://svn.dealii.org/trunk@4381 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/numerics/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index e6b041780a..984617fb7a 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -383,7 +383,7 @@ void VectorTools::project (const Mapping &mapping, // the different boundary parts. We want the // @p{function} to hold on all parts of the // boundary - std::map*> boundary_functions; + FMap::FunctionMap boundary_functions; for (unsigned char c=0; c<255; ++c) boundary_functions[c] = &function; project_boundary_values (dof, boundary_functions, q_boundary, @@ -750,7 +750,7 @@ template void VectorTools::project_boundary_values (const Mapping &mapping, const DoFHandler &dof, - const std::map*> &boundary_functions, + const FMap::FunctionMap &boundary_functions, const Quadrature &q, std::map &boundary_values) { @@ -765,8 +765,7 @@ VectorTools::project_boundary_values (const Mapping &mapping, std::vector dof_to_boundary_mapping; std::set selected_boundary_components; - for (typename std::map*>::const_iterator - i=boundary_functions.begin(); + for (typename FMap::FunctionMap::const_iterator i=boundary_functions.begin(); i!=boundary_functions.end(); ++i) selected_boundary_components.insert (i->first); @@ -843,7 +842,7 @@ VectorTools::project_boundary_values (const Mapping &mapping, template void VectorTools::project_boundary_values (const DoFHandler &dof, - const std::map*> &boundary_functions, + const FMap::FunctionMap &boundary_functions, const Quadrature &q, std::map &boundary_values) { @@ -1268,6 +1267,15 @@ void VectorTools::interpolate(const DoFHandler &, const Vector &, Vector &); template +void VectorTools::project (const DoFHandler &, + const ConstraintMatrix &, + const Quadrature &, + const Function &, + Vector &, + const bool, + const Quadrature &, + const bool); +template void VectorTools::create_right_hand_side (const Mapping &, const DoFHandler &, const Quadrature &, @@ -1279,6 +1287,12 @@ void VectorTools::create_right_hand_side (const DoFHandler &, const Function &, Vector &); template +void VectorTools::interpolate_boundary_values (const DoFHandler &, + const unsigned char, + const Function &, + std::map &, + const std::vector &); +template void VectorTools::integrate_difference (const Mapping &, const DoFHandler &, const Vector &, @@ -1296,8 +1310,14 @@ void VectorTools::integrate_difference (const DoFHandler &, const NormType &, const Function *); template +void VectorTools::project_boundary_values (const Mapping &, + const DoFHandler &, + const FMap::FunctionMap &, + const Quadrature&, + std::map &); +template void VectorTools::project_boundary_values (const DoFHandler &, - const std::map*>&, + const FMap::FunctionMap &, const Quadrature&, std::map &); template @@ -1324,13 +1344,8 @@ void VectorTools::interpolate_boundary_values (const Mapping std::map &, const std::vector &); template -void VectorTools::interpolate_boundary_values (const DoFHandler &, - const unsigned char, - const Function &, - std::map &, - const std::vector &); -template -void VectorTools::project (const DoFHandler &, +void VectorTools::project (const Mapping &, + const DoFHandler &, const ConstraintMatrix &, const Quadrature &, const Function &,