From 391acc1b3e473d41bb30104c9c9ad77418f586da Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 28 Dec 2012 23:16:56 +0000 Subject: [PATCH] Some more cleanup git-svn-id: https://svn.dealii.org/branches/branch_deprecated@27867 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/deal.II/lac/block_matrix_array.h | 5 +---- .../include/deal.II/lac/precondition_block.h | 18 +++++++++--------- .../deal.II/lac/precondition_block.templates.h | 2 +- deal.II/source/grid/tria_accessor.cc | 4 ++-- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/deal.II/include/deal.II/lac/block_matrix_array.h b/deal.II/include/deal.II/lac/block_matrix_array.h index c9eeb5b8d9..73ae0d19a0 100644 --- a/deal.II/include/deal.II/lac/block_matrix_array.h +++ b/deal.II/include/deal.II/lac/block_matrix_array.h @@ -144,12 +144,9 @@ public: * function to call for an object * created by the default * constructor. - * - * @deprecated the last argument - * is ignored. */ void initialize (const unsigned int n_block_rows, - const unsigned int n_block_cols) DEAL_II_DEPRECATED; + const unsigned int n_block_cols); /** * Constructor fixing the diff --git a/deal.II/include/deal.II/lac/precondition_block.h b/deal.II/include/deal.II/lac/precondition_block.h index 57d46f15fa..d3d7feb3ed 100644 --- a/deal.II/include/deal.II/lac/precondition_block.h +++ b/deal.II/include/deal.II/lac/precondition_block.h @@ -1087,7 +1087,7 @@ Accessor (const PreconditionBlockJacobi *matrix, // This is the end accessor, which // does not hava a valid block. - if (a_block == matrix->n_blocks()) + if (a_block == matrix->size()) return; const unsigned int r = row % bs; @@ -1095,8 +1095,8 @@ Accessor (const PreconditionBlockJacobi *matrix, b_iterator = matrix->inverse(a_block).begin(r); b_end = matrix->inverse(a_block).end(); - Assert (a_block < matrix->n_blocks(), - ExcIndexRange(a_block, 0, matrix->n_blocks())); + Assert (a_block < matrix->size(), + ExcIndexRange(a_block, 0, matrix->size())); } @@ -1105,7 +1105,7 @@ inline unsigned int PreconditionBlockJacobi::const_iterator::Accessor::row() const { - Assert (a_block < matrix->n_blocks(), + Assert (a_block < matrix->size(), ExcIteratorPastEnd()); return bs * a_block + b_iterator->row(); @@ -1117,7 +1117,7 @@ inline unsigned int PreconditionBlockJacobi::const_iterator::Accessor::column() const { - Assert (a_block < matrix->n_blocks(), + Assert (a_block < matrix->size(), ExcIteratorPastEnd()); return bs * a_block + b_iterator->column(); @@ -1129,7 +1129,7 @@ inline inverse_type PreconditionBlockJacobi::const_iterator::Accessor::value() const { - Assert (a_block < matrix->n_blocks(), + Assert (a_block < matrix->size(), ExcIteratorPastEnd()); return b_iterator->value(); @@ -1158,7 +1158,7 @@ PreconditionBlockJacobi::const_iterator::operator++ () { ++accessor.a_block; - if (accessor.a_block < accessor.matrix->n_blocks()) + if (accessor.a_block < accessor.matrix->size()) { accessor.b_iterator = accessor.matrix->inverse(accessor.a_block).begin(); accessor.b_end = accessor.matrix->inverse(accessor.a_block).end(); @@ -1192,7 +1192,7 @@ bool PreconditionBlockJacobi::const_iterator:: operator == (const const_iterator &other) const { - if (accessor.a_block == accessor.matrix->n_blocks() && + if (accessor.a_block == accessor.matrix->size() && accessor.a_block == other.accessor.a_block) return true; @@ -1240,7 +1240,7 @@ inline typename PreconditionBlockJacobi::const_iterator PreconditionBlockJacobi::end () const { - return const_iterator(this, this->n_blocks() * this->block_size()); + return const_iterator(this, this->size() * this->block_size()); } diff --git a/deal.II/include/deal.II/lac/precondition_block.templates.h b/deal.II/include/deal.II/lac/precondition_block.templates.h index 1379139aef..41fc24ad95 100644 --- a/deal.II/include/deal.II/lac/precondition_block.templates.h +++ b/deal.II/include/deal.II/lac/precondition_block.templates.h @@ -625,7 +625,7 @@ void PreconditionBlockJacobi begin_diag_block+=this->blocksize; } - dst.scale(this->relaxation); + dst *= this->relaxation; } diff --git a/deal.II/source/grid/tria_accessor.cc b/deal.II/source/grid/tria_accessor.cc index 64de72813f..0661e03696 100644 --- a/deal.II/source/grid/tria_accessor.cc +++ b/deal.II/source/grid/tria_accessor.cc @@ -1348,7 +1348,7 @@ CellAccessor::set_subdomain_id (const types::subdomain_id new_sub template -types::subdomain_id_t CellAccessor::level_subdomain_id () const +types::subdomain_id CellAccessor::level_subdomain_id () const { Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); return this->tria->levels[this->present_level]->level_subdomain_ids[this->present_index]; @@ -1358,7 +1358,7 @@ types::subdomain_id_t CellAccessor::level_subdomain_id () const template void -CellAccessor::set_level_subdomain_id (const types::subdomain_id_t new_level_subdomain_id) const +CellAccessor::set_level_subdomain_id (const types::subdomain_id new_level_subdomain_id) const { Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); this->tria->levels[this->present_level]->level_subdomain_ids[this->present_index] -- 2.39.5