diff --git a/dirneucoupling.cc b/dirneucoupling.cc index 760c5ea1fa1c3f1305d194526272d867c78035a3..9220e3b5fa3c39bbc1eaefb15281837a61d7df97 100644 --- a/dirneucoupling.cc +++ b/dirneucoupling.cc @@ -100,7 +100,7 @@ int main (int argc, char *argv[]) try double rodE = parameterSet.get<double>("rodE"); double rodNu = parameterSet.get<double>("rodNu"); - std::tr1::array<FieldVector<double,3>,2> rodRestEndPoint; + Dune::array<FieldVector<double,3>,2> rodRestEndPoint; rodRestEndPoint[0][0] = parameterSet.get<double>("rodRestEndPoint0X"); rodRestEndPoint[0][1] = parameterSet.get<double>("rodRestEndPoint0Y"); rodRestEndPoint[0][2] = parameterSet.get<double>("rodRestEndPoint0Z"); @@ -288,8 +288,7 @@ int main (int argc, char *argv[]) try multigridStep.setMGType(mu, nu1, nu2); multigridStep.ignoreNodes_ = &dirichletNodes.back(); multigridStep.basesolver_ = &baseSolver; - multigridStep.presmoother_ = &presmoother; - multigridStep.postsmoother_ = &postsmoother; + multigridStep.setSmoother(&presmoother, &postsmoother); multigridStep.verbosity_ = Solver::QUIET; diff --git a/staticrod.cc b/staticrod.cc index ce7308b11df9ecc02247624d7e4ff8f116a4fee1..ada3f1b3b12b9c66058bd5b8d5a49d322b50071e 100644 --- a/staticrod.cc +++ b/staticrod.cc @@ -192,8 +192,7 @@ int main (int argc, char *argv[]) try multigridStep.setMGType(mu, nu1, nu2); multigridStep.ignoreNodes_ = &dirichletNodes[maxlevel]; multigridStep.basesolver_ = &baseSolver; - multigridStep.presmoother_ = &presmoother; - multigridStep.postsmoother_ = &postsmoother; + multigridStep.setSmoother(&presmoother, &postsmoother); multigridStep.hasObstacle_ = &hasObstacle; multigridStep.obstacles_ = &trustRegionObstacles; multigridStep.obstacleRestrictor_ = new MandelObstacleRestrictor<VectorType>; diff --git a/staticrod2.cc b/staticrod2.cc index d75ec8dc38acb64823400f7f74d9bc46f2c76fe3..18d4b4fb77260a1db6d1243bb8b44339efb4a744 100644 --- a/staticrod2.cc +++ b/staticrod2.cc @@ -127,8 +127,7 @@ int main (int argc, char *argv[]) try multigridStep.setMGType(mu, nu1, nu2); multigridStep.ignoreNodes_ = &dirichletNodes[0]; multigridStep.basesolver_ = &baseSolver; - multigridStep.presmoother_ = &presmoother; - multigridStep.postsmoother_ = &postsmoother; + multigridStep.setSmoother(&presmoother, &postsmoother); multigridStep.hasObstacle_ = &hasObstacle; multigridStep.obstacles_ = &trustRegionObstacles; multigridStep.verbosity_ = Solver::QUIET;