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

erstes template-Argument von IterativeSolver entfernt, IterationStep::setProblem auskommentiert

[[Imported from SVN: r2199]]
parent 7e17de77
No related branches found
No related tags found
No related merge requests found
...@@ -179,11 +179,11 @@ int main (int argc, char *argv[]) try ...@@ -179,11 +179,11 @@ int main (int argc, char *argv[]) try
EnergyNorm<MatrixType, VectorType> baseEnergyNorm(baseSolverStep); EnergyNorm<MatrixType, VectorType> baseEnergyNorm(baseSolverStep);
IterativeSolver<MatrixType, VectorType> baseSolver(&baseSolverStep, IterativeSolver<VectorType> baseSolver(&baseSolverStep,
baseIt, baseIt,
baseTolerance, baseTolerance,
&baseEnergyNorm, &baseEnergyNorm,
Solver::QUIET); Solver::QUIET);
// Make pre and postsmoothers // Make pre and postsmoothers
ProjectedBlockGSStep<MatrixType, VectorType> presmoother; ProjectedBlockGSStep<MatrixType, VectorType> presmoother;
...@@ -209,7 +209,7 @@ int main (int argc, char *argv[]) try ...@@ -209,7 +209,7 @@ int main (int argc, char *argv[]) try
EnergyNorm<MatrixType, VectorType> energyNorm(contactMMGStep); EnergyNorm<MatrixType, VectorType> energyNorm(contactMMGStep);
IterativeSolver<MatrixType, VectorType> solver(&contactMMGStep, IterativeSolver<VectorType> solver(&contactMMGStep,
numIt, numIt,
tolerance, tolerance,
&energyNorm, &energyNorm,
...@@ -265,7 +265,8 @@ int main (int argc, char *argv[]) try ...@@ -265,7 +265,8 @@ int main (int argc, char *argv[]) try
//std::cout << "Trust Region obstacles:" << std::endl; //std::cout << "Trust Region obstacles:" << std::endl;
//std::cout << (*contactMMGStep.obstacles_)[maxlevel] << std::endl; //std::cout << (*contactMMGStep.obstacles_)[maxlevel] << std::endl;
solver.iterationStep_->setProblem(hessianMatrix, corr, rhs); //solver.iterationStep_->setProblem(hessianMatrix, corr, rhs);
DUNE_THROW(NotImplemented,"IterationStep::setProblem, Matrix uebergeben");
solver.preprocess(); solver.preprocess();
contactMMGStep.preprocess(); contactMMGStep.preprocess();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment