diff --git a/dune/solvers/test/mmgtest.cc b/dune/solvers/test/mmgtest.cc index b941ef3fd5790072a6ce736e199755e49d8ccb18..453775ff0fb2f494f58ef2d2fe8733389d94eb64 100644 --- a/dune/solvers/test/mmgtest.cc +++ b/dune/solvers/test/mmgtest.cc @@ -30,10 +30,6 @@ template<class GridType, class MatrixType, class VectorType, class BitVector> void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat, VectorType& x, const VectorType& rhs, const BitVector& ignore, int maxIterations=100, double tolerance=1.0e-10) { - typedef VectorType Vector; - typedef MatrixType Matrix; - typedef EnergyNorm<Matrix, Vector> Norm; - // create double obstacle constraints const int blockSize = VectorType::block_type::dimension; @@ -68,7 +64,7 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat Dune::BitSetVector<blockSize> hasObstacle(x.size(),true); mmgStep.hasObstacle_ = &hasObstacle; - std::vector<BoxConstraint<typename Vector::field_type,blockSize> > boxConstraints(rhs.size()); + std::vector<BoxConstraint<typename VectorType::field_type,blockSize> > boxConstraints(rhs.size()); for (int i = 0; i < boxConstraints.size(); ++i) { for (int j = 0; j < blockSize; ++j) diff --git a/dune/solvers/test/quadraticipoptsolvertest.cc b/dune/solvers/test/quadraticipoptsolvertest.cc index aae1e19399bf8e12992ff4c74450dd5a00ea0bc5..2516373f5b7690f03260e904a14955106832790c 100644 --- a/dune/solvers/test/quadraticipoptsolvertest.cc +++ b/dune/solvers/test/quadraticipoptsolvertest.cc @@ -28,15 +28,12 @@ template<class GridType, class MatrixType, class VectorType, class BitVector> void solveObstacleProblemByQuadraticIPOptSolver(const GridType& grid, const MatrixType& mat, VectorType& x, const VectorType& rhs, const BitVector& ignore, int maxIterations=100, double tolerance=1.0e-10) { - typedef VectorType Vector; - typedef MatrixType Matrix; - typedef EnergyNorm<Matrix, Vector> Norm; typedef QuadraticIPOptSolver<MatrixType,VectorType> Solver; const int blockSize = VectorType::block_type::dimension; // create double obstacle constraints - std::vector<BoxConstraint<typename Vector::field_type,blockSize> > boxConstraints(rhs.size()); + std::vector<BoxConstraint<typename VectorType::field_type,blockSize> > boxConstraints(rhs.size()); for (int i = 0; i < boxConstraints.size(); ++i) { for (int j = 0; j < blockSize; ++j)