From 676afa71039a5c449c2af5fd175b439e30e45bc8 Mon Sep 17 00:00:00 2001
From: Leo Schmidt <lschmidt@math.fu-berlin.de>
Date: Fri, 18 Apr 2008 13:23:42 +0000
Subject: [PATCH] erstes template-Argument von IterativeSolver entfernt,
IterationStep::setProblem auskommentiert
[[Imported from SVN: r2199]]
---
staticrod.cc | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/staticrod.cc b/staticrod.cc
index f894f7b0..37b4fd81 100644
--- a/staticrod.cc
+++ b/staticrod.cc
@@ -179,11 +179,11 @@ int main (int argc, char *argv[]) try
EnergyNorm<MatrixType, VectorType> baseEnergyNorm(baseSolverStep);
- IterativeSolver<MatrixType, VectorType> baseSolver(&baseSolverStep,
- baseIt,
- baseTolerance,
- &baseEnergyNorm,
- Solver::QUIET);
+ IterativeSolver<VectorType> baseSolver(&baseSolverStep,
+ baseIt,
+ baseTolerance,
+ &baseEnergyNorm,
+ Solver::QUIET);
// Make pre and postsmoothers
ProjectedBlockGSStep<MatrixType, VectorType> presmoother;
@@ -209,7 +209,7 @@ int main (int argc, char *argv[]) try
EnergyNorm<MatrixType, VectorType> energyNorm(contactMMGStep);
- IterativeSolver<MatrixType, VectorType> solver(&contactMMGStep,
+ IterativeSolver<VectorType> solver(&contactMMGStep,
numIt,
tolerance,
&energyNorm,
@@ -265,7 +265,8 @@ int main (int argc, char *argv[]) try
//std::cout << "Trust Region obstacles:" << 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();
contactMMGStep.preprocess();
--
GitLab