From b7fe24c153f62b58075938369e4076683cf41627 Mon Sep 17 00:00:00 2001
From: Leo Schmidt <lschmidt@math.fu-berlin.de>
Date: Wed, 21 Oct 2009 12:33:13 +0000
Subject: [PATCH] use Dune::array instead of std::tr1::array. use setSmoother
method
[[Imported from SVN: r5080]]
---
dirneucoupling.cc | 5 ++---
staticrod.cc | 3 +--
staticrod2.cc | 3 +--
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/dirneucoupling.cc b/dirneucoupling.cc
index 760c5ea1..9220e3b5 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 ce7308b1..ada3f1b3 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 d75ec8dc..18d4b4fb 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;
--
GitLab