From 6ac54349f87c09510b67fb2b8428cbc3354b55cc Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 9 Jan 2015 00:10:44 -0600 Subject: [PATCH] Remove deprecated function TrilinosWrappers::*Vector*::compress with Epetra_CombineMode argument. --- doc/news/changes.h | 2 ++ include/deal.II/lac/trilinos_block_vector.h | 29 --------------- .../lac/trilinos_parallel_block_vector.h | 36 ------------------- include/deal.II/lac/trilinos_vector_base.h | 23 ------------ 4 files changed, 2 insertions(+), 88 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index 7e155f1eda..ac0dfb0dc6 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -117,6 +117,8 @@ inconvenience this causes. normal_vector ones. In all cases, the new functions have been around for a while. - Vector::scale. +- TrilinosWrappers::*Vector*::compress with an Epetra_CombineMode + argument diff --git a/include/deal.II/lac/trilinos_block_vector.h b/include/deal.II/lac/trilinos_block_vector.h index a063d40a78..c3f0b87989 100644 --- a/include/deal.II/lac/trilinos_block_vector.h +++ b/include/deal.II/lac/trilinos_block_vector.h @@ -154,22 +154,6 @@ namespace TrilinosWrappers */ ~BlockVector (); - /** - * use compress(VectorOperation) instead - * - * @deprecated - * - * See - * @ref GlossCompress "Compressing distributed objects" - * for more information. - */ - void compress (const Epetra_CombineMode last_action) DEAL_II_DEPRECATED; - - /** - * so it is not hidden - */ - using BlockVectorBase::compress; - /** * Copy operator: fill all components of the vector that are locally * stored with the given scalar value. @@ -414,19 +398,6 @@ namespace TrilinosWrappers } - inline - void - BlockVector::compress (const Epetra_CombineMode last_action) - { - if (last_action == Add) - this->compress(::dealii::VectorOperation::add); - else if (last_action == Insert) - this->compress(::dealii::VectorOperation::insert); - else - AssertThrow(false, ExcNotImplemented()); - } - - inline void BlockVector::swap (BlockVector &v) diff --git a/include/deal.II/lac/trilinos_parallel_block_vector.h b/include/deal.II/lac/trilinos_parallel_block_vector.h index a0291b5c50..2fdddaebab 100644 --- a/include/deal.II/lac/trilinos_parallel_block_vector.h +++ b/include/deal.II/lac/trilinos_parallel_block_vector.h @@ -262,24 +262,6 @@ namespace TrilinosWrappers void import_nonlocal_data_for_fe (const TrilinosWrappers::BlockSparseMatrix &m, const BlockVector &v); - - /** - * use compress(VectorOperation) instead - * - * @deprecated - * - * See - * @ref GlossCompress "Compressing distributed objects" - * for more information. - */ - void compress (const Epetra_CombineMode last_action) DEAL_II_DEPRECATED; - - /** - * so it is not hidden - */ - using BlockVectorBase::compress; - - /** * Returns the state of the vector, i.e., whether compress() needs to be * called after an operation requiring data exchange. Does only return @@ -414,24 +396,6 @@ namespace TrilinosWrappers - inline - void - BlockVector::compress (const Epetra_CombineMode last_action) - { - ::dealii::VectorOperation::values last_action_ = - ::dealii::VectorOperation::unknown; - if (last_action == Add) - last_action_ = ::dealii::VectorOperation::add; - else if (last_action == Insert) - last_action_ = ::dealii::VectorOperation::insert; - else - AssertThrow(false, ExcNotImplemented()); - - this->compress(last_action_); - } - - - template BlockVector & BlockVector::operator = (const ::dealii::BlockVector &v) diff --git a/include/deal.II/lac/trilinos_vector_base.h b/include/deal.II/lac/trilinos_vector_base.h index 50d54123fa..d0acd63090 100644 --- a/include/deal.II/lac/trilinos_vector_base.h +++ b/include/deal.II/lac/trilinos_vector_base.h @@ -282,11 +282,6 @@ namespace TrilinosWrappers */ void compress (::dealii::VectorOperation::values operation); - /** - * @deprecated Use compress(dealii::VectorOperation::values) instead. - */ - void compress (const Epetra_CombineMode last_action) DEAL_II_DEPRECATED; - /** * Returns the state of the vector, i.e., whether compress() has already * been called after an operation requiring data exchange. @@ -1206,24 +1201,6 @@ namespace TrilinosWrappers - inline - void - VectorBase::compress (const Epetra_CombineMode last_action) - { - ::dealii::VectorOperation::values last_action_ = - ::dealii::VectorOperation::unknown; - if (last_action == Add) - last_action_ = ::dealii::VectorOperation::add; - else if (last_action == Insert) - last_action_ = ::dealii::VectorOperation::insert; - else - AssertThrow(false, ExcNotImplemented()); - - compress(last_action_); - } - - - inline VectorBase & VectorBase::operator = (const TrilinosScalar s) -- 2.39.5