diff --git a/dune/solvers/common/genericvectortools.hh b/dune/solvers/common/genericvectortools.hh index c4bb6df2a14911fe0ced7f4b74754868c5abb49f..29b95b24af2c2e830958c16589e3969a3b034f3d 100644 --- a/dune/solvers/common/genericvectortools.hh +++ b/dune/solvers/common/genericvectortools.hh @@ -277,8 +277,6 @@ struct GenericMatrix // dune_static_assert(BitVectorTypeR.size()==n and BitVectorTypeC.size()==m,"BitVector length doesn't match matrix size."); assert(trows.size()==n and tcols.size()==m); - typedef typename Dune::FieldMatrix<field_type,n,m> MatrixType; - for(size_t row=0; row<n; ++row) { if (trows[row]) @@ -300,8 +298,6 @@ struct GenericMatrix template <class field_type, int n, class BitVectorType> static void truncate(Dune::DiagonalMatrix<field_type,n>& mat, const BitVectorType& trows, const BitVectorType& tcols, bool setTruncatedDiagonalOne) { - typedef typename Dune::DiagonalMatrix<field_type,n> MatrixType; - for(size_t row=0; row<n; ++row) { if (trows[row]) diff --git a/dune/solvers/common/staticmatrixtools.hh b/dune/solvers/common/staticmatrixtools.hh index d21ff4188e6b7d7e417eefad15d203edb30e3b50..d2f132c8b75fd93c70fc4827c45d6e45b9bc2232 100644 --- a/dune/solvers/common/staticmatrixtools.hh +++ b/dune/solvers/common/staticmatrixtools.hh @@ -280,8 +280,6 @@ class StaticMatrix template<class MatrixBlockA, class MatrixB, class MatrixT> static void transformMatrix(Dune::BCRSMatrix<MatrixBlockA>& A, const MatrixT& X, const MatrixB& B, const MatrixT& Y) { - typedef typename Dune::BCRSMatrix<MatrixBlockA> MatrixA; - transformMatrixPattern(A, X, B, Y); A = 0.0; for (int k=0; k<B.N(); ++k) @@ -315,8 +313,6 @@ class StaticMatrix template<class MatrixBlockA, class MatrixB, class MatrixT> static void transformMatrixPattern(Dune::BCRSMatrix<MatrixBlockA>& A, const MatrixT& X, const MatrixB& B, const MatrixT& Y) { - typedef typename Dune::BCRSMatrix<MatrixBlockA> MatrixA; - Dune::MatrixIndexSet indices(X.M(), Y.M()); for (int k=0; k<B.N(); ++k) { diff --git a/dune/solvers/iterationsteps/truncatedblockgsstep.hh b/dune/solvers/iterationsteps/truncatedblockgsstep.hh index dae872c265cb6104e7f0c10e50a0dcb9fdf4df32..d68db41a5bb81abade22447e41e19e4fd1bad317 100644 --- a/dune/solvers/iterationsteps/truncatedblockgsstep.hh +++ b/dune/solvers/iterationsteps/truncatedblockgsstep.hh @@ -95,7 +95,6 @@ struct RecursiveGSStep<1> static void apply(const MType& mat, const VType& rhs, const BVType& ignore, VType& x) { typedef typename MType::block_type MBlock; - typedef typename VType::block_type VBlock; for (size_t i=0; i<mat.N(); ++i) { @@ -162,7 +161,6 @@ public: virtual void iterate() { typedef typename SparseMatrixType::row_type::ConstIterator SparseMatrixColumnIterator; - typedef typename LowRankMatrixType::LowRankFactorType::row_type::ConstIterator LowRankFactorColumnIterator; const MatrixType& mat = *this->mat_; const SparseMatrixType& sparse_mat = mat.sparseMatrix(); diff --git a/dune/solvers/transferoperators/genericmultigridtransfer.hh b/dune/solvers/transferoperators/genericmultigridtransfer.hh index c1fd17e8e769502bc375578bdf297d6f28ce07f7..c1cedbc18ff980f23c1e9bd1875f2ac8589ea8a9 100644 --- a/dune/solvers/transferoperators/genericmultigridtransfer.hh +++ b/dune/solvers/transferoperators/genericmultigridtransfer.hh @@ -233,9 +233,6 @@ public: t.resize(matrix.N()); - typedef typename DiscFuncType::Iterator Iterator; - typedef typename DiscFuncType::ConstIterator ConstIterator; - typedef typename TransferOperatorType::row_type RowType; typedef typename RowType::ConstIterator ColumnIterator; @@ -267,9 +264,6 @@ public: t.resize(matrix.N()*virtualBlockSize); - typedef typename DiscFuncType::Iterator Iterator; - typedef typename DiscFuncType::ConstIterator ConstIterator; - typedef typename TransferOperatorType::row_type RowType; typedef typename RowType::ConstIterator ColumnIterator; @@ -303,9 +297,6 @@ public: t.resize(matrix.M()); t = 0; - typedef typename DiscFuncType::Iterator Iterator; - typedef typename DiscFuncType::ConstIterator ConstIterator; - typedef typename TransferOperatorType::row_type RowType; typedef typename RowType::ConstIterator ColumnIterator; @@ -336,9 +327,6 @@ public: t.resize(matrix.M()*virtualBlockSize); t = 0; - typedef typename DiscFuncType::Iterator Iterator; - typedef typename DiscFuncType::ConstIterator ConstIterator; - typedef typename TransferOperatorType::row_type RowType; typedef typename RowType::ConstIterator ColumnIterator;