Commit b4a058b0 authored by Leo Schmidt's avatar Leo Schmidt Committed by lschmidt@PCPOOL.MI.FU-BERLIN.DE
Browse files

corrected includes, IterativeSolver -> LoopSolver, BoundaryPatch -> LevelBoundaryPatch

[[Imported from SVN: r10133]]
parent d480c87f
......@@ -7,17 +7,17 @@
#include <dune/grid/io/file/amirameshwriter.hh>
#include <dune/grid/io/file/amirameshreader.hh>
#include "src/ogdenassembler.hh"
#include "dune-elasticity/ogdenassembler.hh"
#include <dune/istl/io.hh>
#include <dune/ag-common/prolongboundarypatch.hh>
#include <dune/ag-common/sampleonbitfield.hh>
#include <dune/ag-common/readbitfield.hh>
#include <dune/ag-common/quadraticipopt.hh>
#include <dune/ag-common/iterativesolver.hh>
#include <dune/ag-common/norms/energynorm.hh>
#include <dune/ag-common/solvers/mmgstep.hh>
#include <dune-solvers/solvers/quadraticipopt.hh>
#include <dune-solvers/solvers/loopsolver.hh>
#include <dune-solvers/norms/energynorm.hh>
#include <dune-solvers/iterationsteps/mmgstep.hh>
// Choose a solver
#define IPOPT
......@@ -68,7 +68,7 @@ int main (int argc, char *argv[]) try
Dune::AmiraMeshReader<GridType>::read(grid, gridFile);
// Read Dirichlet boundary values
std::vector<BoundaryPatch<GridType> > dirichletBoundary(numLevels);
std::vector<LevelBoundaryPatch<GridType> > dirichletBoundary(numLevels);
dirichletBoundary[0].setup(grid,0);
readBoundaryPatch(dirichletBoundary[0], dnFile);
......@@ -161,7 +161,7 @@ int main (int argc, char *argv[]) try
SmootherType projectedBlockGSStep(*bilinearForm, x, rhs);
projectedBlockGSStep.dirichletNodes_ = &dirichletNodes[maxlevel];
IterativeSolver<OperatorType, ContactVector<dim> > solver;
::LoopSolver<OperatorType, ContactVector<dim> > solver;
solver.iterationStep = &projectedBlockGSStep;
solver.numIt = numIt;
solver.verbosity_ = Solver::FULL;
......@@ -181,7 +181,7 @@ int main (int argc, char *argv[]) try
ProjectedBlockGSStep<OperatorType, ContactVector<dim> > baseSolverStep;
IterativeSolver<OperatorType, ContactVector<dim> > baseSolver;
::LoopSolver<OperatorType, ContactVector<dim> > baseSolver;
baseSolver.iterationStep = &baseSolverStep;
baseSolver.numIt = baseIt;
baseSolver.verbosity_ = Solver::QUIET;
......@@ -203,7 +203,7 @@ int main (int argc, char *argv[]) try
contactMMGStep.postsmoother_ = &postsmoother;
contactMMGStep.funcSpace_ = funcSpace;
IterativeSolver<OperatorType, ContactVector<dim> > solver;
::LoopSolver<OperatorType, ContactVector<dim> > solver;
solver.iterationStep = &contactMMGStep;
solver.numIt = numIt;
solver.verbosity_ = Solver::FULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment