From: kronbichler Date: Wed, 6 Feb 2013 11:52:16 +0000 (+0000) Subject: Remove some more deprecated function calls. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0512166eabce2a77480789bebfd8a0e01b69a1be;p=dealii-svn.git Remove some more deprecated function calls. git-svn-id: https://svn.dealii.org/trunk@28251 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/lac/relaxation_block.templates.h b/deal.II/include/deal.II/lac/relaxation_block.templates.h index f0fa8b5e90..0d4f2f903a 100644 --- a/deal.II/include/deal.II/lac/relaxation_block.templates.h +++ b/deal.II/include/deal.II/lac/relaxation_block.templates.h @@ -119,13 +119,13 @@ RelaxationBlock::invert_diagblocks () // Copy rows for this block // into the matrix for the // diagonal block - SparsityPattern::row_iterator row - = additional_data->block_list.row_begin(block); + SparsityPattern::iterator row + = additional_data->block_list.begin(block); for (unsigned int row_cell=0; row_cellcolumn()); + entry != M.end(row->column()); ++entry) { const unsigned int column = entry->column(); const unsigned int col_cell = additional_data->block_list.row_position(block, column); @@ -205,20 +205,20 @@ RelaxationBlock::do_step ( b_cell.reinit(bs); x_cell.reinit(bs); // Collect off-diagonal parts - SparsityPattern::row_iterator row = additional_data->block_list.row_begin(block); + SparsityPattern::iterator row = additional_data->block_list.begin(block); for (unsigned int row_cell=0; row_cellcolumn()); + for (typename MATRIX::const_iterator entry = M.begin(row->column()); + entry != M.end(row->column()); ++entry) b_cell(row_cell) -= entry->value() * prev(entry->column()); } // Apply inverse diagonal this->inverse_vmult(block, x_cell, b_cell); // Store in result vector - row=additional_data->block_list.row_begin(block); + row=additional_data->block_list.begin(block); for (unsigned int row_cell=0; row_cellrelaxation * x_cell(row_cell); + dst(row->column()) = prev(row->column()) + additional_data->relaxation * x_cell(row_cell); } } }