]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove deprecated constructor of SparseILU.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 5 Jan 2015 00:54:13 +0000 (18:54 -0600)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 9 Jan 2015 06:56:03 +0000 (00:56 -0600)
doc/news/changes.h
include/deal.II/lac/sparse_ilu.h
include/deal.II/lac/sparse_ilu.templates.h
tests/lac/bicgstab_early.cc
tests/lac/sparse_ilu.cc
tests/lac/sparse_ilu_t.cc

index e793cde2bf1e68f9cd7395b30cfa749bd153e7f3..952ee98343e39d8145053021aa6d87fd2765bf53 100644 (file)
@@ -102,6 +102,7 @@ inconvenience this causes.
 - Namespace deal_II_numbers.
 - Triangulation::distort_random.
 - Triangulation::clear_user_pointers.
+- The deprecated constructor of SparseILU.
 
 <!-- ----------- GENERAL IMPROVEMENTS ----------------- -->
 
index fb72d42d69d8c9397f48b357d0917d8ddc571778..d60aa11d9cdff4f9375f7e99c275410e3fcb2892 100644 (file)
@@ -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.
index d57a582b23485d933a0b8c2ac94158d99e77fcce..cc1acae42b63055c3250aa73b1b78a38229a71f7 100644 (file)
@@ -34,15 +34,6 @@ SparseILU<number>::SparseILU ()
 
 
 
-template <typename number>
-SparseILU<number>::SparseILU (const SparsityPattern &sparsity)
-{
-  SparseMatrix<number>::reinit(sparsity);
-}
-
-
-
-
 template <typename number>
 template <typename somenumber>
 void SparseILU<number>::initialize (const SparseMatrix<somenumber> &matrix,
index d28962f449b595d188239d7f1d6d0f4c37eadfb1..93f5aa9be01e93308c0f85ca0d4b49e6c81d5695 100644 (file)
@@ -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<double> ilu (sparsity_pattern);
-  ilu.decompose (M);
+  SparseILU<double>::AdditionalData data;
+  data.use_this_sparsity = &sparsity_pattern;
+  SparseILU<double> ilu;
+  ilu.initialize (M, data);
 
   Vector<double> solution (4);
   // this would fail with elements of
index 98c2ad698146175e4650f0c555534d2c097a53e3..54f3d08816e3fd040d2b882ba88ef96f9f1e2eeb 100644 (file)
@@ -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<double> ilu (ilu_pattern);
-          ilu.decompose (A);
+
+         SparseILU<double>::AdditionalData data;
+         data.use_this_sparsity = &ilu_pattern;
+          SparseILU<double> ilu;
+         ilu.initialize (A, data);
 
           // now for three test vectors v
           // determine norm of
index d8e1d1294a5f9ee0315d9847d382c57d6860dcda..94f26d18af0c1f8681afbe36364057eb431322c2 100644 (file)
@@ -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<double> ilu (ilu_pattern);
-          ilu.decompose (A);
+         SparseILU<double>::AdditionalData data;
+         data.use_this_sparsity = &ilu_pattern;
+          SparseILU<double> ilu;
+         ilu.initialize (A, data);
 
           // now for three test vectors v
           // determine norm of

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.