From 9e609d4585bd10bc893f2dabdbd35d57162506f0 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Fri, 23 Jan 2015 19:46:16 -0600
Subject: [PATCH] Remove deprecated function
 GridTools::extract_boundary_mesh().

---
 doc/news/changes.h                |  1 +
 examples/step-38/step-38.cc       |  9 ++++-----
 include/deal.II/grid/grid_tools.h | 15 ---------------
 source/grid/grid_tools.cc         | 17 -----------------
 source/grid/grid_tools.inst.in    | 17 +----------------
 5 files changed, 6 insertions(+), 53 deletions(-)

diff --git a/doc/news/changes.h b/doc/news/changes.h
index c111876164..8008516f74 100644
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -165,6 +165,7 @@ inconvenience this causes.
   - The version of parallel::distributed::Vector::scale
     function that takes a scalar as argument.
   - GridTools::create_union_triangulation.
+  - GridTools::extract_boundary_mesh.
   <br>
   This release also removes the deprecated class MGDoFHandler. The
   functionality of this class had previously been incorporated into
diff --git a/examples/step-38/step-38.cc b/examples/step-38/step-38.cc
index a5495901f6..acc6275fd8 100644
--- a/examples/step-38/step-38.cc
+++ b/examples/step-38/step-38.cc
@@ -30,7 +30,6 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_boundary_lib.h>
 #include <deal.II/grid/grid_generator.h>
-#include <deal.II/grid/grid_tools.h>
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/vector.h>
 #include <deal.II/lac/solver_control.h>
@@ -288,13 +287,13 @@ namespace Step38
   // indicators of all faces on the outside of the boundary to zero for the
   // ones located on the perimeter of the disk/ball, and one on the straight
   // part that splits the full disk/ball into two halves. The next step is the
-  // main point: The GridTools::extract_boundary_mesh function creates a mesh
+  // main point: The GridGenerator::extract_boundary_mesh function creates a mesh
   // that consists of those cells that are the faces of the previous mesh,
   // i.e. it describes the <i>surface</i> cells of the original (volume)
   // mesh. However, we do not want all faces: only those on the perimeter of
   // the disk or ball which carry boundary indicator zero; we can select these
   // cells using a set of boundary indicators that we pass to
-  // GridTools::extract_boundary_mesh.
+  // GridGenerator::extract_boundary_mesh.
   //
   // There is one point that needs to be mentioned. In order to refine a
   // surface mesh appropriately if the manifold is curved (similarly to
@@ -327,8 +326,8 @@ namespace Step38
       std::set<types::boundary_id> boundary_ids;
       boundary_ids.insert (0);
 
-      GridTools::extract_boundary_mesh (volume_mesh, triangulation,
-                                        boundary_ids);
+      GridGenerator::extract_boundary_mesh (volume_mesh, triangulation,
+                                            boundary_ids);
     }
     triangulation.refine_global(4);
 
diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h
index eac23073fd..da90f4e4d7 100644
--- a/include/deal.II/grid/grid_tools.h
+++ b/include/deal.II/grid/grid_tools.h
@@ -871,21 +871,6 @@ namespace GridTools
   };
 #endif
 
-  /**
-   * @deprecated Use GridGenerator::extract_boundary_mesh() instead.
-   */
-  template <template <int,int> class Container, int dim, int spacedim>
-#ifndef _MSC_VER
-  std::map<typename Container<dim-1,spacedim>::cell_iterator,
-      typename Container<dim,spacedim>::face_iterator>
-#else
-  typename ExtractBoundaryMesh<Container,dim,spacedim>::return_type
-#endif
-      extract_boundary_mesh (const Container<dim,spacedim> &volume_mesh,
-                             Container<dim-1,spacedim>     &surface_mesh,
-                             const std::set<types::boundary_id> &boundary_ids
-                             = std::set<types::boundary_id>()) DEAL_II_DEPRECATED;
-
   /*@}*/
   /**
    * @name Dealing with periodic domains
diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index 266b351339..db2e2ec8d4 100644
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -2485,23 +2485,6 @@ next_cell:
 
 
 
-  template <template <int,int> class Container, int dim, int spacedim>
-#ifndef _MSC_VER
-  std::map<typename Container<dim-1,spacedim>::cell_iterator,
-      typename Container<dim,spacedim>::face_iterator>
-#else
-  typename ExtractBoundaryMesh<Container,dim,spacedim>::return_type
-#endif
-      extract_boundary_mesh (const Container<dim,spacedim> &volume_mesh,
-                             Container<dim-1,spacedim>     &surface_mesh,
-                             const std::set<types::boundary_id> &boundary_ids)
-  {
-    // this function is deprecated. call the one that replaced it
-    return GridGenerator::extract_boundary_mesh (volume_mesh, surface_mesh, boundary_ids);
-  }
-
-
-
   /*
    * Internally used in orthogonal_equality
    *
diff --git a/source/grid/grid_tools.inst.in b/source/grid/grid_tools.inst.in
index dde95735ad..7c1ae95385 100644
--- a/source/grid/grid_tools.inst.in
+++ b/source/grid/grid_tools.inst.in
@@ -240,23 +240,8 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
       std::vector<Container<deal_II_dimension,deal_II_space_dimension>::active_cell_iterator>
       get_patch_around_cell<Container<deal_II_dimension,deal_II_space_dimension> >
       (const Container<deal_II_dimension,deal_II_space_dimension>::active_cell_iterator &cell);
-
-
-#if deal_II_dimension != 1
-      template
-#ifndef _MSC_VER
-      std::map<Container<deal_II_dimension-1,deal_II_space_dimension>::cell_iterator,
-		   Container<deal_II_dimension,deal_II_space_dimension>::face_iterator>
-#else
-      ExtractBoundaryMesh<Container,deal_II_dimension,deal_II_space_dimension>::return_type
-#endif
-      extract_boundary_mesh (const Container<deal_II_dimension, deal_II_space_dimension> &mesh,
-			     Container<deal_II_dimension-1,deal_II_space_dimension>  &boundary_mesh,
-			     const std::set<types::boundary_id> &boundary_ids);
-#endif
-      \}
+    \}
 #endif
-
   }
 
 
-- 
2.39.5