]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix two non-compilabilities.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 18 Nov 1999 17:37:00 +0000 (17:37 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 18 Nov 1999 17:37:00 +0000 (17:37 +0000)
git-svn-id: https://svn.dealii.org/trunk@1892 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/Attic/examples/multigrid/multigrid.cc
tests/big-tests/multigrid/multigrid.cc

index 317a7282c971032ab984a5aafb380f07155d223e..ba302d71e0f244a24966e25db648eb00742ad8f8 100644 (file)
@@ -395,8 +395,13 @@ void PoissonProblem<dim>::assemble (const Equation<dim>      &equation,
                                   // apply Dirichlet bc as described
                                   // in the docs
   map<int, double> boundary_value_list;
-  VectorTools<dim>::interpolate_boundary_values (*dof, dirichlet_bc,
-                                                boundary_value_list);
+
+  for (FunctionMap::const_iterator bc=dirichlet_bc.begin();
+       bc != dirichlet_bc.end(); ++bc)
+    VectorTools<dim>::interpolate_boundary_values (*dof,
+                                                  bc->first,
+                                                  *bc->second,
+                                                  boundary_value_list);
   MatrixTools<dim>::apply_boundary_values (boundary_value_list,
                                           system_matrix, solution,
                                           right_hand_side);  
@@ -414,7 +419,7 @@ void PoissonProblem<dim>::solve () {
 
                                   // solve
   cg.solve (system_matrix, solution, right_hand_side,
-           PreconditionIdentity<Vector<double> >());
+           PreconditionIdentity());
                                   // distribute solution
   constraints.distribute (solution);
 };
index 317a7282c971032ab984a5aafb380f07155d223e..ba302d71e0f244a24966e25db648eb00742ad8f8 100644 (file)
@@ -395,8 +395,13 @@ void PoissonProblem<dim>::assemble (const Equation<dim>      &equation,
                                   // apply Dirichlet bc as described
                                   // in the docs
   map<int, double> boundary_value_list;
-  VectorTools<dim>::interpolate_boundary_values (*dof, dirichlet_bc,
-                                                boundary_value_list);
+
+  for (FunctionMap::const_iterator bc=dirichlet_bc.begin();
+       bc != dirichlet_bc.end(); ++bc)
+    VectorTools<dim>::interpolate_boundary_values (*dof,
+                                                  bc->first,
+                                                  *bc->second,
+                                                  boundary_value_list);
   MatrixTools<dim>::apply_boundary_values (boundary_value_list,
                                           system_matrix, solution,
                                           right_hand_side);  
@@ -414,7 +419,7 @@ void PoissonProblem<dim>::solve () {
 
                                   // solve
   cg.solve (system_matrix, solution, right_hand_side,
-           PreconditionIdentity<Vector<double> >());
+           PreconditionIdentity());
                                   // distribute solution
   constraints.distribute (solution);
 };

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.