From e340f4dca7b7c68adfe7d3e519bf76d247522b92 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 23 Jan 2015 09:31:16 -0600 Subject: [PATCH] Remove deprecated functions BlockMatrixArray and BlockTrianglePreconditioner. --- doc/news/changes.h | 2 + include/deal.II/lac/block_matrix_array.h | 109 ----------------------- source/lac/block_matrix_array.cc | 45 ---------- 3 files changed, 2 insertions(+), 154 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index 857ee370b1..d3ed4ffacb 100644 --- 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.
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 164a98d3d4..320cbf7e0a 100644 --- 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 > &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 > &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 - void enter_aux (VectorMemory > &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 > &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 > &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 - void enter_aux (VectorMemory > &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::enter ( } -template -template -inline -void -BlockMatrixArray::enter_aux ( - VectorMemory > &mem, - const MATRIX &matrix, - unsigned int row, - unsigned int col, - double prefix, - bool transpose) -{ - Assert(row template inline @@ -711,23 +619,6 @@ BlockTrianglePrecondition::enter (const MATRIX &matrix, -template -template -inline -void -BlockTrianglePrecondition::enter_aux ( - VectorMemory > &mem, - const MATRIX &matrix, - size_type row, - size_type col, - double prefix, - bool transpose) -{ - BlockMatrixArray::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 321dcf129e..e5ac5df4db 100644 --- a/source/lac/block_matrix_array.cc +++ b/source/lac/block_matrix_array.cc @@ -62,28 +62,6 @@ BlockMatrixArray::BlockMatrixArray ( {} -template -BlockMatrixArray::BlockMatrixArray ( - const unsigned int n_block_rows, - const unsigned int n_block_cols, - VectorMemory > &) - : block_rows (n_block_rows), - block_cols (n_block_cols) -{} - - -template -void -BlockMatrixArray::initialize ( - const unsigned int n_block_rows, - const unsigned int n_block_cols, - VectorMemory > &) -{ - block_rows = n_block_rows; - block_cols = n_block_cols; -} - - template void BlockMatrixArray::initialize ( @@ -279,17 +257,6 @@ BlockTrianglePrecondition::BlockTrianglePrecondition() {} -template -BlockTrianglePrecondition::BlockTrianglePrecondition( - const unsigned int block_rows, - VectorMemory > &, - const bool backward) - : - BlockMatrixArray (block_rows, block_rows), - backward(backward) -{} - - template BlockTrianglePrecondition::BlockTrianglePrecondition( const unsigned int block_rows) @@ -299,18 +266,6 @@ BlockTrianglePrecondition::BlockTrianglePrecondition( {} -template -void -BlockTrianglePrecondition::initialize( - const unsigned int n_block_rows, - VectorMemory > &, - const bool backward) -{ - BlockMatrixArray::initialize(n_block_rows, n_block_rows); - this->backward = backward; -} - - template void BlockTrianglePrecondition::reinit ( -- 2.39.5