From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Sat, 24 Jan 2015 01:52:40 +0000 (-0600)
Subject: Remove deprecated function BlockVector::scale().
X-Git-Tag: v8.3.0-rc1~518^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed329e595b14a9cd9453d80c206b330e9405736e;p=dealii.git

Remove deprecated function BlockVector::scale().
---

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 6ecc46bec0..14734b7dbe 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 and
+  - The version of BlockVector::scale and
+    parallel::distributed::Vector::scale,
     parallel::distributed::BlockVector::scale
     function that takes a scalar as argument.
   - GridTools::create_union_triangulation.
diff --git a/include/deal.II/lac/block_vector.h b/include/deal.II/lac/block_vector.h
index 4e44d69b26..c860d4da51 100644
--- a/include/deal.II/lac/block_vector.h
+++ b/include/deal.II/lac/block_vector.h
@@ -275,16 +275,6 @@ public:
   void reinit (const BlockVector<Number2> &V,
                const bool                 fast=false);
 
-  /**
-   * 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>.
@@ -442,18 +432,6 @@ void BlockVector<Number>::compress (::dealii::VectorOperation::values operation)
 
 
 
-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] *= factor;
-}
-
-
-
 template <typename Number>
 template <class BlockVector2>
 void BlockVector<Number>::scale (const BlockVector2 &v)
diff --git a/include/deal.II/lac/schur_matrix.h b/include/deal.II/lac/schur_matrix.h
index efe8c6421b..c780595614 100644
--- a/include/deal.II/lac/schur_matrix.h
+++ b/include/deal.II/lac/schur_matrix.h
@@ -271,7 +271,7 @@ double SchurMatrix<MA_inverse, MB, MDt, MC>
            const BlockVector<double> &rhs) const
 {
   vmult(dst, src);
-  dst.scale(-1.);
+  dst *= -1.;
   dst += rhs;
   return dst.l2_norm();
 }