Skip to content
Snippets Groups Projects
Commit b7fe24c1 authored by Leo Schmidt's avatar Leo Schmidt Committed by lschmidt@PCPOOL.MI.FU-BERLIN.DE
Browse files

use Dune::array instead of std::tr1::array. use setSmoother method

[[Imported from SVN: r5080]]
parent f8bf4803
Branches
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -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>;
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment