From: Wolfgang Bangerth Date: Mon, 5 Jan 2015 00:54:13 +0000 (-0600) Subject: Remove deprecated constructor of SparseILU. X-Git-Tag: v8.3.0-rc1~563^2~9 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba57587371fbdb325bb60827cae645aa0efcfd51;p=dealii.git Remove deprecated constructor of SparseILU. --- diff --git a/doc/news/changes.h b/doc/news/changes.h index e793cde2bf..952ee98343 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -102,6 +102,7 @@ inconvenience this causes. - Namespace deal_II_numbers. - Triangulation::distort_random. - Triangulation::clear_user_pointers. +- The deprecated constructor of SparseILU. diff --git a/include/deal.II/lac/sparse_ilu.h b/include/deal.II/lac/sparse_ilu.h index fb72d42d69..d60aa11d9c 100644 --- a/include/deal.II/lac/sparse_ilu.h +++ b/include/deal.II/lac/sparse_ilu.h @@ -73,14 +73,6 @@ public: */ SparseILU (); - /** - * @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. - */ - SparseILU (const SparsityPattern &sparsity) DEAL_II_DEPRECATED; - /** * Make SparseLUDecomposition::AdditionalData accessible to this class as * well. diff --git a/include/deal.II/lac/sparse_ilu.templates.h b/include/deal.II/lac/sparse_ilu.templates.h index d57a582b23..cc1acae42b 100644 --- a/include/deal.II/lac/sparse_ilu.templates.h +++ b/include/deal.II/lac/sparse_ilu.templates.h @@ -34,15 +34,6 @@ SparseILU::SparseILU () -template -SparseILU::SparseILU (const SparsityPattern &sparsity) -{ - SparseMatrix::reinit(sparsity); -} - - - - template template void SparseILU::initialize (const SparseMatrix &matrix, diff --git a/tests/lac/bicgstab_early.cc b/tests/lac/bicgstab_early.cc index d28962f449..93f5aa9be0 100644 --- a/tests/lac/bicgstab_early.cc +++ b/tests/lac/bicgstab_early.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2007 - 2013 by the deal.II authors +// Copyright (C) 2007 - 2013, 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -73,8 +73,10 @@ int main() rhs(1) = rhs(3) = 0.0975; - SparseILU ilu (sparsity_pattern); - ilu.decompose (M); + SparseILU::AdditionalData data; + data.use_this_sparsity = &sparsity_pattern; + SparseILU ilu; + ilu.initialize (M, data); Vector solution (4); // this would fail with elements of diff --git a/tests/lac/sparse_ilu.cc b/tests/lac/sparse_ilu.cc index 98c2ad6981..54f3d08816 100644 --- a/tests/lac/sparse_ilu.cc +++ b/tests/lac/sparse_ilu.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2001 - 2013 by the deal.II authors +// Copyright (C) 2001 - 2013, 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -88,8 +88,11 @@ int main() Assert (false, ExcNotImplemented()); }; ilu_pattern.compress(); - SparseILU ilu (ilu_pattern); - ilu.decompose (A); + + SparseILU::AdditionalData data; + data.use_this_sparsity = &ilu_pattern; + SparseILU ilu; + ilu.initialize (A, data); // now for three test vectors v // determine norm of diff --git a/tests/lac/sparse_ilu_t.cc b/tests/lac/sparse_ilu_t.cc index d8e1d1294a..94f26d18af 100644 --- a/tests/lac/sparse_ilu_t.cc +++ b/tests/lac/sparse_ilu_t.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2001 - 2013 by the deal.II authors +// Copyright (C) 2001 - 2013, 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -88,8 +88,10 @@ int main() Assert (false, ExcNotImplemented()); }; ilu_pattern.compress(); - SparseILU ilu (ilu_pattern); - ilu.decompose (A); + SparseILU::AdditionalData data; + data.use_this_sparsity = &ilu_pattern; + SparseILU ilu; + ilu.initialize (A, data); // now for three test vectors v // determine norm of