From 9aed0d65789548599d775c897c66f6c629eb13d1 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 4 Feb 2015 09:07:05 -0600 Subject: [PATCH] Remove deprecated function SparseILU::decompose. --- doc/news/changes.h | 2 +- include/deal.II/lac/sparse_ilu.h | 8 -------- include/deal.II/lac/sparse_ilu.templates.h | 19 ++++--------------- source/lac/sparse_ilu.cc | 10 +--------- 4 files changed, 6 insertions(+), 33 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index 7a53a1114c..0eda2920d1 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -148,7 +148,7 @@ inconvenience this causes. - The deprecated constructor of SparseILU. - SparseILU::apply_decomposition. - The deprecated constructor of SparseMIC. - - SparseMIC::decompose. + - SparseMIC::decompose and SparseILU::decompose. - 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_ilu.h b/include/deal.II/lac/sparse_ilu.h index df59dbe825..d2e86ed571 100644 --- a/include/deal.II/lac/sparse_ilu.h +++ b/include/deal.II/lac/sparse_ilu.h @@ -102,14 +102,6 @@ public: void initialize (const SparseMatrix &matrix, const AdditionalData ¶meters = AdditionalData()); - /** - * @deprecated This method is deprecated, and left for backward compability. - * It will be removed in later versions. - */ - template - void decompose (const SparseMatrix &matrix, - const double strengthen_diagonal=0.) DEAL_II_DEPRECATED; - /** * Apply the incomplete decomposition, i.e. do one forward-backward step * $dst=(LU)^{-1}src$. diff --git a/include/deal.II/lac/sparse_ilu.templates.h b/include/deal.II/lac/sparse_ilu.templates.h index 913e84b372..9c0c1faf33 100644 --- a/include/deal.II/lac/sparse_ilu.templates.h +++ b/include/deal.II/lac/sparse_ilu.templates.h @@ -41,26 +41,16 @@ void SparseILU::initialize (const SparseMatrix &matrix, { SparseLUDecomposition::initialize(matrix, data); - decompose(matrix, data.strengthen_diagonal); -} - - - -template -template -void SparseILU::decompose (const SparseMatrix &matrix, - const double strengthen_diagonal) -{ Assert (matrix.m()==matrix.n(), ExcNotQuadratic ()); Assert (this->m()==this->n(), ExcNotQuadratic ()); Assert (matrix.m()==this->m(), ExcDimensionMismatch(matrix.m(), this->m())); - Assert (strengthen_diagonal>=0, - ExcInvalidStrengthening (strengthen_diagonal)); + Assert (data.strengthen_diagonal>=0, + ExcInvalidStrengthening (data.strengthen_diagonal)); - SparseLUDecomposition::decompose (matrix, strengthen_diagonal); + SparseLUDecomposition::decompose (matrix, data.strengthen_diagonal); - if (strengthen_diagonal>0) + if (data.strengthen_diagonal>0) this->strengthen_diagonal_impl(); // in the following, we implement algorithm 10.4 in the book by Saad by @@ -145,7 +135,6 @@ label_200: - template template void SparseILU::vmult (Vector &dst, diff --git a/source/lac/sparse_ilu.cc b/source/lac/sparse_ilu.cc index fd84976453..035e0a9251 100644 --- a/source/lac/sparse_ilu.cc +++ b/source/lac/sparse_ilu.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 1999 - 2014 by the deal.II authors +// Copyright (C) 1999 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -22,16 +22,12 @@ DEAL_II_NAMESPACE_OPEN template class SparseILU; template void SparseILU::initialize (const SparseMatrix &, const AdditionalData &data); -template void SparseILU::decompose (const SparseMatrix &, - const double); template void SparseILU::vmult (Vector &, const Vector &) const; template void SparseILU::Tvmult (Vector &, const Vector &) const; template void SparseILU::initialize (const SparseMatrix &, const AdditionalData &data); -template void SparseILU::decompose (const SparseMatrix &, - const double); template void SparseILU::vmult (Vector &, const Vector &) const; template void SparseILU::Tvmult (Vector &, @@ -41,16 +37,12 @@ template void SparseILU::Tvmult (Vector &, template class SparseILU; template void SparseILU::initialize (const SparseMatrix &, const AdditionalData &data); -template void SparseILU::decompose (const SparseMatrix &, - const double); template void SparseILU::vmult (Vector &, const Vector &) const; template void SparseILU::Tvmult (Vector &, const Vector &) const; template void SparseILU::initialize (const SparseMatrix &, const AdditionalData &data); -template void SparseILU::decompose (const SparseMatrix &, - const double); template void SparseILU::vmult (Vector &, const Vector &) const; template void SparseILU::Tvmult (Vector &, -- 2.39.5