From 2027250bf91f79231484f4bdf7951b1d6e86cc4e Mon Sep 17 00:00:00 2001 From: kronbichler Date: Wed, 6 Feb 2013 11:29:52 +0000 Subject: [PATCH] Avoid one more deprecated call. git-svn-id: https://svn.dealii.org/trunk@28250 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/numerics/matrix_tools.cc | 46 ++++++------------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/deal.II/source/numerics/matrix_tools.cc b/deal.II/source/numerics/matrix_tools.cc index d6516f5435..855306a649 100644 --- a/deal.II/source/numerics/matrix_tools.cc +++ b/deal.II/source/numerics/matrix_tools.cc @@ -2267,9 +2267,7 @@ namespace MatrixTools // transpose block for (unsigned int block_row=0; block_row &transpose_matrix = matrix.block(block_index.first, block_row); - // traverse the row of - // the transpose block - // to find the - // interesting rows in - // the present block. - // don't use the - // diagonal element of - // the diagonal block + // traverse the row of the transpose block to find the + // interesting rows in the present block. don't use the + // diagonal element of the diagonal block for (typename SparseMatrix::iterator q = (block_index.first == block_row ? transpose_matrix.begin(block_index.second)+1 : @@ -2294,30 +2287,14 @@ namespace MatrixTools q != transpose_matrix.end(block_index.second); ++q) { - // get the number - // of the column in - // this row in - // which a nonzero - // entry is. this - // is also the row - // of the transpose - // block which has - // an entry in the - // interesting row + // get the number of the column in this row in which a + // nonzero entry is. this is also the row of the transpose + // block which has an entry in the interesting row const unsigned int row = q->column(); - // find the position of - // element - // (row,dof_number) - // in this block - // (not in the - // transpose - // one). note that - // we have to take - // care of special - // cases with - // square - // sub-matrices + // find the position of element (row,dof_number) in this + // block (not in the transpose one). note that we have to + // take care of special cases with square sub-matrices bool (*comp)(const typename SparseMatrix::iterator::value_type p, const unsigned int column) = &column_less_than::iterator>; @@ -2326,8 +2303,7 @@ namespace MatrixTools if (this_sparsity.n_rows() == this_sparsity.n_cols()) { - if (this_sparsity.get_column_numbers() - [this_sparsity.get_rowstart_indices()[row]] + if (this_matrix.begin(row)->column() == block_index.second) p = this_matrix.begin(row); -- 2.39.5