From 13c883c2ada05eb3009c0696047fd9ea1d5eb4f4 Mon Sep 17 00:00:00 2001 From: wolf Date: Thu, 18 Nov 1999 17:37:00 +0000 Subject: [PATCH] Fix two non-compilabilities. git-svn-id: https://svn.dealii.org/trunk@1892 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/Attic/examples/multigrid/multigrid.cc | 11 ++++++++--- tests/big-tests/multigrid/multigrid.cc | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc b/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc index 317a7282c9..ba302d71e0 100644 --- a/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc +++ b/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc @@ -395,8 +395,13 @@ void PoissonProblem::assemble (const Equation &equation, // apply Dirichlet bc as described // in the docs map boundary_value_list; - VectorTools::interpolate_boundary_values (*dof, dirichlet_bc, - boundary_value_list); + + for (FunctionMap::const_iterator bc=dirichlet_bc.begin(); + bc != dirichlet_bc.end(); ++bc) + VectorTools::interpolate_boundary_values (*dof, + bc->first, + *bc->second, + boundary_value_list); MatrixTools::apply_boundary_values (boundary_value_list, system_matrix, solution, right_hand_side); @@ -414,7 +419,7 @@ void PoissonProblem::solve () { // solve cg.solve (system_matrix, solution, right_hand_side, - PreconditionIdentity >()); + PreconditionIdentity()); // distribute solution constraints.distribute (solution); }; diff --git a/tests/big-tests/multigrid/multigrid.cc b/tests/big-tests/multigrid/multigrid.cc index 317a7282c9..ba302d71e0 100644 --- a/tests/big-tests/multigrid/multigrid.cc +++ b/tests/big-tests/multigrid/multigrid.cc @@ -395,8 +395,13 @@ void PoissonProblem::assemble (const Equation &equation, // apply Dirichlet bc as described // in the docs map boundary_value_list; - VectorTools::interpolate_boundary_values (*dof, dirichlet_bc, - boundary_value_list); + + for (FunctionMap::const_iterator bc=dirichlet_bc.begin(); + bc != dirichlet_bc.end(); ++bc) + VectorTools::interpolate_boundary_values (*dof, + bc->first, + *bc->second, + boundary_value_list); MatrixTools::apply_boundary_values (boundary_value_list, system_matrix, solution, right_hand_side); @@ -414,7 +419,7 @@ void PoissonProblem::solve () { // solve cg.solve (system_matrix, solution, right_hand_side, - PreconditionIdentity >()); + PreconditionIdentity()); // distribute solution constraints.distribute (solution); }; -- 2.39.5