From c5b7541c8ea533b80fa26773dc4b33fb549be4e5 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth <bangerth@math.tamu.edu> Date: Fri, 23 Jan 2015 19:50:18 -0600 Subject: [PATCH] Remove deprecated function parallel::distributed::BlockVector::scale(). --- doc/news/changes.h | 3 ++- include/deal.II/lac/parallel_block_vector.h | 22 --------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index adf83f1445..6ecc46bec0 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -162,7 +162,8 @@ inconvenience this causes. - The SolverSelector constructor that takes a VectorMemory argument. - The version of parallel::distributed::Vector::compress_finish function that takes a boolean as argument. - - The version of parallel::distributed::Vector::scale + - The version of parallel::distributed::Vector::scale and + parallel::distributed::BlockVector::scale function that takes a scalar as argument. - GridTools::create_union_triangulation. - GridTools::extract_boundary_mesh. diff --git a/include/deal.II/lac/parallel_block_vector.h b/include/deal.II/lac/parallel_block_vector.h index 58b555540c..87eb823ebd 100644 --- a/include/deal.II/lac/parallel_block_vector.h +++ b/include/deal.II/lac/parallel_block_vector.h @@ -400,16 +400,6 @@ namespace parallel const BlockVector<Number> &V, const BlockVector<Number> &W); - /** - * Scale each element of the vector by the given factor. - * - * This function is deprecated and will be removed in a future version. - * Use <tt>operator *=</tt> and <tt>operator /=</tt> instead. - * - * @deprecated Use <tt>operator*=</tt> instead. - */ - void scale (const value_type factor) DEAL_II_DEPRECATED; - /** * Multiply each element of this vector by the corresponding element of * <tt>v</tt>. @@ -986,18 +976,6 @@ namespace parallel - template <typename Number> - void BlockVector<Number>::scale (const value_type factor) - { - - Assert (numbers::is_finite(factor), ExcNumberNotFinite()); - - for (size_type i=0; i<this->n_blocks(); ++i) - this->components[i].scale(factor); - } - - - template <typename Number> template <class BlockVector2> void BlockVector<Number>::scale (const BlockVector2 &v) -- 2.39.5