Remove deprecated functions BlockMatrixArray and BlockTrianglePreconditioner.

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 857ee370b1bc2be794b0af4030dea27ed0552f30..d3ed4ffacb21d8e3c0f239d95e3249996bed890e 100644 (file)
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -156,6 +156,8 @@ inconvenience this causes.
   - The typedef CompressedBlockSparsityPattern.
   - The deprecated constructors of SparsityPattern iterator classes.
   - The deprecated variants of DoFTools::make_periodicity_constraints.
+  - BlockMatrixArray and BlockTrianglePreconditioner functions that
+    take an explicit VectorMemory object.
   <br>
   This release also removes the deprecated class MGDoFHandler. The
   functionality of this class had previously been incorporated into

diff --git a/include/deal.II/lac/block_matrix_array.h b/include/deal.II/lac/block_matrix_array.h
index 164a98d3d4400a47a5a2a32d861cc5f6293a5300..320cbf7e0ad5ff32bce6d14c9b090b203a9e0755 100644 (file)
--- a/include/deal.II/lac/block_matrix_array.h
+++ b/include/deal.II/lac/block_matrix_array.h
@@ -139,27 +139,6 @@ public:
   void initialize (const unsigned int n_block_rows,
                    const unsigned int n_block_cols);
 
-  /**
-   * Constructor fixing the dimensions.
-   *
-   * @deprecated The last argument is ignored. Use the constructor with only
-   * the first two arguments.
-   */
-  BlockMatrixArray (const unsigned int n_block_rows,
-                    const unsigned int n_block_cols,
-                    VectorMemory<Vector<number> > &mem) DEAL_II_DEPRECATED;
-
-  /**
-   * Initialize object completely. This is the function to call for an object
-   * created by the default constructor.
-   *
-   * @deprecated The last argument is ignored. Use the function with same name
-   * but only the first two arguments.
-   */
-  void initialize (const unsigned int n_block_rows,
-                   const unsigned int n_block_cols,
-                   VectorMemory<Vector<number> > &mem) DEAL_II_DEPRECATED;
-
   /**
    * Adjust the matrix to a new size and delete all blocks.
    */
@@ -183,22 +162,6 @@ public:
               const double        prefix = 1.,
               const bool          transpose = false);
 
-  /**
-   * Add an entry like with enter, but use PointerMatrixAux for matrices not
-   * having functions vmult_add() and TVmult_add().
-   *
-   * @deprecated The first argument is ignored. Use the function with same
-   * name but without the first argument.
-   */
-  template <class MATRIX>
-  void enter_aux (VectorMemory<Vector<number> > &mem,
-                  const MATRIX       &matrix,
-                  const unsigned int  row,
-                  const unsigned int  col,
-                  const double        prefix = 1.,
-                  const bool          transpose = false) DEAL_II_DEPRECATED;
-
-
   /**
    * Delete all entries, i.e. reset the matrix to an empty state.
    */
@@ -445,28 +408,6 @@ public:
    */
   BlockTrianglePrecondition (const unsigned int n_blocks);
 
-  /**
-   * Constructor. This matrix must be block-quadratic. The additional
-   * parameter allows for backward insertion instead of forward.
-   *
-   * @deprecated The second argument is ignored. Use the constructor with only
-   * the first and third argument.
-   */
-  BlockTrianglePrecondition (const unsigned int n_block_rows,
-                             VectorMemory<Vector<number> > &mem,
-                             const bool backward = false) DEAL_II_DEPRECATED;
-
-  /**
-   * Initialize object completely. This is the function to call for an object
-   * created by the default constructor.
-   *
-   * @deprecated The second argument is ignored. Use the function without that
-   * argument.
-   */
-  void initialize (const unsigned int n_block_rows,
-                   VectorMemory<Vector<number> > &mem,
-                   const bool backward = false) DEAL_II_DEPRECATED;
-
   /**
    * Resize preconditioner to a new size and clear all blocks.
    */
@@ -484,21 +425,6 @@ public:
               const double    prefix = 1.,
               const bool      transpose = false);
 
-  /**
-   * Enter a block. This calls BlockMatrixArray::enter_aux(). Remember that
-   * the diagonal blocks should actually be inverse matrices or
-   * preconditioners.
-   *
-   * @deprecated The first argument is ignored. Use enter() instead.
-   */
-  template <class MATRIX>
-  void enter_aux (VectorMemory<Vector<double> > &mem,
-                  const MATRIX   &matrix,
-                  const size_type row,
-                  const size_type col,
-                  const double    prefix = 1.,
-                  const bool      transpose = false) DEAL_II_DEPRECATED;
-
   /**
    * Preconditioning.
    */
@@ -617,24 +543,6 @@ BlockMatrixArray<number>::enter (
 }
 
 
-template <typename number>
-template <class MATRIX>
-inline
-void
-BlockMatrixArray<number>::enter_aux (
-  VectorMemory<Vector<number> > &mem,
-  const MATRIX &matrix,
-  unsigned int row,
-  unsigned int col,
-  double prefix,
-  bool transpose)
-{
-  Assert(row<n_block_rows(), ExcIndexRange(row, 0, n_block_rows()));
-  Assert(col<n_block_cols(), ExcIndexRange(col, 0, n_block_cols()));
-  entries.push_back(Entry(matrix, row, col, prefix, transpose, mem));
-}
-
-
 template <typename number>
 template <class STREAM>
 inline
@@ -711,23 +619,6 @@ BlockTrianglePrecondition<number>::enter (const MATRIX &matrix,
 
 
 
-template <typename number>
-template <class MATRIX>
-inline
-void
-BlockTrianglePrecondition<number>::enter_aux (
-  VectorMemory<Vector<double> > &mem,
-  const MATRIX &matrix,
-  size_type row,
-  size_type col,
-  double prefix,
-  bool transpose)
-{
-  BlockMatrixArray<number>::enter_aux(mem, matrix, row, col, prefix, transpose);
-}
-
-
-
 #endif // DOXYGEN
 
 DEAL_II_NAMESPACE_CLOSE

diff --git a/source/lac/block_matrix_array.cc b/source/lac/block_matrix_array.cc
index 321dcf129e6493a273adc30b6646a7db296ca45c..e5ac5df4db65aed959d5467ae0e62a1c5fce9d5e 100644 (file)
--- a/source/lac/block_matrix_array.cc
+++ b/source/lac/block_matrix_array.cc
@@ -62,28 +62,6 @@ BlockMatrixArray<number>::BlockMatrixArray (
 {}
 
 
-template <typename number>
-BlockMatrixArray<number>::BlockMatrixArray (
-  const unsigned int n_block_rows,
-  const unsigned int n_block_cols,
-  VectorMemory<Vector<number> > &)
-  : block_rows (n_block_rows),
-    block_cols (n_block_cols)
-{}
-
-
-template <typename number>
-void
-BlockMatrixArray<number>::initialize (
-  const unsigned int n_block_rows,
-  const unsigned int n_block_cols,
-  VectorMemory<Vector<number> > &)
-{
-  block_rows = n_block_rows;
-  block_cols = n_block_cols;
-}
-
-
 template <typename number>
 void
 BlockMatrixArray<number>::initialize (
@@ -279,17 +257,6 @@ BlockTrianglePrecondition<number>::BlockTrianglePrecondition()
 {}
 
 
-template <typename number>
-BlockTrianglePrecondition<number>::BlockTrianglePrecondition(
-  const unsigned int block_rows,
-  VectorMemory<Vector<number> > &,
-  const bool backward)
-  :
-  BlockMatrixArray<number> (block_rows, block_rows),
-  backward(backward)
-{}
-
-
 template <typename number>
 BlockTrianglePrecondition<number>::BlockTrianglePrecondition(
   const unsigned int block_rows)
@@ -299,18 +266,6 @@ BlockTrianglePrecondition<number>::BlockTrianglePrecondition(
 {}
 
 
-template <typename number>
-void
-BlockTrianglePrecondition<number>::initialize(
-  const unsigned int n_block_rows,
-  VectorMemory<Vector<number> > &,
-  const bool backward)
-{
-  BlockMatrixArray<number>::initialize(n_block_rows, n_block_rows);
-  this->backward = backward;
-}
-
-
 template <typename number>
 void
 BlockTrianglePrecondition<number>::reinit (