From 05c81e2df7fc6ec33a15b198f84a52a7c500e607 Mon Sep 17 00:00:00 2001
From: Daniel Arndt <arndtd@ornl.gov>
Date: Fri, 27 Mar 2020 12:19:57 -0400
Subject: [PATCH] Remove Triangulation::set_manifold()

---
 .../incompatibilities/20200327DanielArndt-2   |  4 ++++
 include/deal.II/grid/tria.h                   | 19 -------------------
 source/grid/tria.cc                           |  8 --------
 tests/numerics/project_common.h               |  2 +-
 4 files changed, 5 insertions(+), 28 deletions(-)
 create mode 100644 doc/news/changes/incompatibilities/20200327DanielArndt-2

diff --git a/doc/news/changes/incompatibilities/20200327DanielArndt-2 b/doc/news/changes/incompatibilities/20200327DanielArndt-2
new file mode 100644
index 0000000000..eef0d12b1b
--- /dev/null
+++ b/doc/news/changes/incompatibilities/20200327DanielArndt-2
@@ -0,0 +1,4 @@
+Removed: The deprecated member function Triangulation::set_manifold() taking
+one parameter has been removed. Use Triangulation::reset_manifold() instead.
+<br>
+(Daniel Arndt, 2020/03/27)
diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h
index b8902f7225..5866fd2188 100644
--- a/include/deal.II/grid/tria.h
+++ b/include/deal.II/grid/tria.h
@@ -1630,25 +1630,6 @@ public:
   set_manifold(const types::manifold_id       number,
                const Manifold<dim, spacedim> &manifold_object);
 
-
-  /**
-   * Reset those parts of the triangulation with the given manifold_id
-   * to use a FlatManifold object. This is the default state of a
-   * non-curved triangulation, and undoes assignment of a different
-   * Manifold object by the function of same name and two arguments.
-   *
-   * @ingroup manifold
-   *
-   * @deprecated This method has been deprecated. Use
-   * Triangulation::reset_manifold() instead.
-   *
-   * @see
-   * @ref GlossManifoldIndicator "Glossary entry on manifold indicators"
-   */
-  DEAL_II_DEPRECATED
-  void
-  set_manifold(const types::manifold_id number);
-
   /**
    * Reset those parts of the triangulation with the given
    * @p manifold_number to use a FlatManifold object. This is the
diff --git a/source/grid/tria.cc b/source/grid/tria.cc
index bce97ba251..98f8d49917 100644
--- a/source/grid/tria.cc
+++ b/source/grid/tria.cc
@@ -10251,14 +10251,6 @@ Triangulation<dim, spacedim>::set_manifold(
 
 
 
-template <int dim, int spacedim>
-void
-Triangulation<dim, spacedim>::set_manifold(const types::manifold_id m_number)
-{
-  reset_manifold(m_number);
-}
-
-
 template <int dim, int spacedim>
 void
 Triangulation<dim, spacedim>::reset_manifold(const types::manifold_id m_number)
diff --git a/tests/numerics/project_common.h b/tests/numerics/project_common.h
index dee826d719..9aa43ed9ec 100644
--- a/tests/numerics/project_common.h
+++ b/tests/numerics/project_common.h
@@ -209,7 +209,7 @@ test_with_wrong_face_orientation(const FiniteElement<dim> &fe,
     {
       Triangulation<dim> triangulation;
       GridGenerator::hyper_ball(triangulation);
-      triangulation.set_manifold(0);
+      triangulation.reset_manifold(0);
       typename Triangulation<dim>::active_cell_iterator cell =
         triangulation.begin_active();
       std::advance(cell, i);
-- 
2.39.5