Remove deprecated SparsityTools::reorder_Cuthill_McKee

diff --git a/doc/news/changes/incompatibilities/20170515DanielArndt b/doc/news/changes/incompatibilities/20170515DanielArndt
new file mode 100644 (file)
index 0000000..2cfb000
--- /dev/null
+++ b/doc/news/changes/incompatibilities/20170515DanielArndt
@@ -0,0 +1,5 @@
+Changed: The deprecated function SparsityTools::reorder_Cuthill_McKee() 
+acting on a SparsityPattern object has been removed.
+Use the one acting on a DynamicSparsityPattern instead.
+<br>
+(Daniel Arndt, 2017/05/15)

diff --git a/include/deal.II/lac/sparsity_tools.h b/include/deal.II/lac/sparsity_tools.h
index 74b7c57bd279394bb64d76263c4cc580173240f3..cad55f07841cb08ed8c0d85f2dcc0e91396f653e 100644 (file)
--- a/include/deal.II/lac/sparsity_tools.h
+++ b/include/deal.II/lac/sparsity_tools.h
@@ -135,16 +135,6 @@ namespace SparsityTools
                          std::vector<DynamicSparsityPattern::size_type> &new_indices,
                          const std::vector<DynamicSparsityPattern::size_type> &starting_indices = std::vector<DynamicSparsityPattern::size_type>());
 
-  /**
-   * As above, but taking a SparsityPattern object instead.
-   *
-   * @deprecated
-   */
-  void
-  reorder_Cuthill_McKee (const SparsityPattern &sparsity,
-                         std::vector<SparsityPattern::size_type> &new_indices,
-                         const std::vector<SparsityPattern::size_type> &starting_indices = std::vector<SparsityPattern::size_type>()) DEAL_II_DEPRECATED;
-
   /**
    * For a given sparsity pattern, compute a re-enumeration of row/column
    * indices in a hierarchical way, similar to what

diff --git a/source/lac/sparsity_tools.cc b/source/lac/sparsity_tools.cc
index fd152985b16c08bd38aa45000ef7eb863369c0e5..ef32909eaa321f0ba1e3e503fcb5fa41d7be1142 100644 (file)
--- a/source/lac/sparsity_tools.cc
+++ b/source/lac/sparsity_tools.cc
@@ -328,23 +328,6 @@ namespace SparsityTools
 
 
 
-  void
-  reorder_Cuthill_McKee (const SparsityPattern                   &sparsity,
-                         std::vector<SparsityPattern::size_type> &new_indices,
-                         const std::vector<SparsityPattern::size_type> &starting_indices)
-  {
-    DynamicSparsityPattern dsp(sparsity.n_rows(), sparsity.n_cols());
-    for (unsigned int row=0; row<sparsity.n_rows(); ++row)
-      {
-        for (SparsityPattern::iterator it=sparsity.begin(row); it!=sparsity.end(row)
-             && it->is_valid_entry() ; ++it)
-          dsp.add(row, it->column());
-      }
-    reorder_Cuthill_McKee(dsp, new_indices, starting_indices);
-  }
-
-
-
   namespace internal
   {
     void