From: Wolfgang Bangerth Date: Mon, 5 Jan 2015 03:57:25 +0000 (-0600) Subject: Remove deprecated constructor of SparseMIC. X-Git-Tag: v8.3.0-rc1~563^2~7 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ddbc2aa0cc53552df0f9bcc3dbc817534579264;p=dealii.git Remove deprecated constructor of SparseMIC. --- diff --git a/doc/news/changes.h b/doc/news/changes.h index 15e529a54b..0b672c655d 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -104,6 +104,7 @@ inconvenience this causes. - Triangulation::clear_user_pointers. - The deprecated constructor of SparseILU. - SparseILU::apply_decomposition. +- The deprecated constructor of SparseMIC. diff --git a/include/deal.II/lac/sparse_mic.h b/include/deal.II/lac/sparse_mic.h index c92c40db83..b14b22a386 100644 --- a/include/deal.II/lac/sparse_mic.h +++ b/include/deal.II/lac/sparse_mic.h @@ -56,14 +56,6 @@ public: */ SparseMIC (); - /** - * @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. - */ - SparseMIC (const SparsityPattern &sparsity) DEAL_II_DEPRECATED; - /** * Destructor. */ diff --git a/include/deal.II/lac/sparse_mic.templates.h b/include/deal.II/lac/sparse_mic.templates.h index d949e84e08..c51aa5546d 100644 --- a/include/deal.II/lac/sparse_mic.templates.h +++ b/include/deal.II/lac/sparse_mic.templates.h @@ -33,17 +33,6 @@ SparseMIC::SparseMIC () -template -SparseMIC::SparseMIC (const SparsityPattern &sparsity) - : - diag(0), - inv_diag(0), - inner_sums(0) -{ - SparseMatrix::reinit (sparsity); -} - - template SparseMIC::~SparseMIC() { diff --git a/tests/lac/sparse_mic.cc b/tests/lac/sparse_mic.cc index a3445f2218..8c0ed6a1c2 100644 --- a/tests/lac/sparse_mic.cc +++ b/tests/lac/sparse_mic.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. // @@ -90,8 +90,10 @@ int main() Assert (false, ExcNotImplemented()); }; mic_pattern.compress(); - SparseMIC mic (mic_pattern); - mic.decompose (A); + SparseMIC::AdditionalData data; + data.use_this_sparsity = &mic_pattern; + SparseMIC mic; + mic.initialize (A, data); // now for three test vectors v // determine norm of