From: Wolfgang Bangerth Date: Mon, 16 Feb 2015 20:03:53 +0000 (-0600) Subject: Remove deprecated functions from SparseLUDecomposition. X-Git-Tag: v8.3.0-rc1~455^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1c2105bf5eac4f378e3416ea330dcfbe11f81b3;p=dealii.git Remove deprecated functions from SparseLUDecomposition. --- diff --git a/doc/news/changes.h b/doc/news/changes.h index 2e7a7f693e..a34f018e7d 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -158,11 +158,11 @@ inconvenience this causes.
With headers in deal.II/lac/: - - The deprecated constructor of SparseILU. - - SparseILU::apply_decomposition. - - The deprecated constructor of SparseMIC. + - The deprecated constructors of SparseMIC, + SparseILU, and SparseLUDecomposition. - SparseMIC::decompose and SparseILU::decompose. - - SparseMIC::reinit. + - SparseMIC::reinit and SparseLUDecomposition::reinit. + - SparseILU::apply_decomposition. - The compress() functions without argument in the various vector classes. You should use the versions with a VectorOperation argument instead. diff --git a/include/deal.II/lac/sparse_decomposition.h b/include/deal.II/lac/sparse_decomposition.h index 27917c6920..ae2b7fe030 100644 --- a/include/deal.II/lac/sparse_decomposition.h +++ b/include/deal.II/lac/sparse_decomposition.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2002 - 2014 by the deal.II authors +// Copyright (C) 2002 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -143,14 +143,6 @@ protected: */ SparseLUDecomposition (); - /** - * @deprecated This method is deprecated, and left for backward - * compatibility. It will be removed in later versions. Instead, pass the - * sparsity pattern that you want used for the decomposition in the - * AdditionalData structure. - */ - SparseLUDecomposition (const SparsityPattern &sparsity) DEAL_II_DEPRECATED; - public: /** * Declare type for container size. @@ -244,14 +236,6 @@ public: void initialize (const SparseMatrix &matrix, const AdditionalData parameters); - /** - * This method is deprecated, and left for backward compatibility. It will - * be removed in later versions. - * - * @deprecated - */ - void reinit (const SparsityPattern &sparsity) DEAL_II_DEPRECATED; - /** * This method is deprecated, and left for backward compability. It will be * removed in later versions. diff --git a/include/deal.II/lac/sparse_decomposition.templates.h b/include/deal.II/lac/sparse_decomposition.templates.h index bf7c3c14f8..cc02600549 100644 --- a/include/deal.II/lac/sparse_decomposition.templates.h +++ b/include/deal.II/lac/sparse_decomposition.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2002 - 2014 by the deal.II authors +// Copyright (C) 2002 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -37,16 +37,6 @@ SparseLUDecomposition::SparseLUDecomposition() -template -SparseLUDecomposition:: -SparseLUDecomposition (const SparsityPattern &sparsity) : - SparseMatrix(sparsity), - decomposed(false), - own_sparsity(0) -{} - - - template SparseLUDecomposition::~SparseLUDecomposition() { @@ -158,21 +148,6 @@ decompose (const SparseMatrix &matrix, -template -void SparseLUDecomposition::reinit (const SparsityPattern &sparsity) -{ - Assert (sparsity.n_rows() == sparsity.n_cols(), - typename SparsityPattern::ExcDiagonalNotOptimized()); - decomposed = false; - { - std::vector tmp; - tmp.swap (prebuilt_lower_bound); - } - SparseMatrix::reinit (sparsity); -} - - - template void SparseLUDecomposition::prebuild_lower_bound()