From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Sat, 24 Jan 2015 01:44:46 +0000 (-0600)
Subject: Remove deprecated function GridTools::create_union_triangulation().
X-Git-Tag: v8.3.0-rc1~518^2~4
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dbff47d3629be13801b39ccf239294c50fb2e38;p=dealii.git

Remove deprecated function GridTools::create_union_triangulation().
---

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 91278646f6..c111876164 100644
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -164,6 +164,7 @@ inconvenience this causes.
     function that takes a boolean as argument.
   - The version of parallel::distributed::Vector::scale
     function that takes a scalar as argument.
+  - GridTools::create_union_triangulation.
   <br>
   This release also removes the deprecated class MGDoFHandler. The
   functionality of this class had previously been incorporated into
diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h
index bca7f03a9d..eac23073fd 100644
--- a/include/deal.II/grid/grid_tools.h
+++ b/include/deal.II/grid/grid_tools.h
@@ -769,15 +769,6 @@ namespace GridTools
   have_same_coarse_mesh (const Container &mesh_1,
                          const Container &mesh_2);
 
-  /**
-   * @deprecated Use GridGenerator::create_union_triangulation().
-   */
-  template <int dim, int spacedim>
-  void
-  create_union_triangulation (const Triangulation<dim, spacedim> &triangulation_1,
-                              const Triangulation<dim, spacedim> &triangulation_2,
-                              Triangulation<dim, spacedim>       &result)  DEAL_II_DEPRECATED;
-
   /*@}*/
   /**
    * @name Dealing with distorted cells
diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index 75978de290..266b351339 100644
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -1877,17 +1877,6 @@ next_cell:
 
 
 
-  template <int dim, int spacedim>
-  void
-  create_union_triangulation (const Triangulation<dim, spacedim> &triangulation_1,
-                              const Triangulation<dim, spacedim> &triangulation_2,
-                              Triangulation<dim, spacedim>       &result)
-  {
-    // this function is deprecated. call the function that replaced it
-    GridGenerator::create_union_triangulation (triangulation_1, triangulation_2, result);
-  }
-
-
   namespace internal
   {
     namespace FixUpDistortedChildCells
diff --git a/source/grid/grid_tools.inst.in b/source/grid/grid_tools.inst.in
index c39f356412..dde95735ad 100644
--- a/source/grid/grid_tools.inst.in
+++ b/source/grid/grid_tools.inst.in
@@ -204,13 +204,6 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
       double
       maximal_cell_diameter (const Triangulation<deal_II_dimension, deal_II_space_dimension> &triangulation);
 
-    template
-      void
-      create_union_triangulation (
-	const Triangulation<deal_II_dimension, deal_II_space_dimension> &triangulation_1,
-	const Triangulation<deal_II_dimension, deal_II_space_dimension> &triangulation_2,
-	Triangulation<deal_II_dimension, deal_II_space_dimension>       &result);
-
 #if deal_II_dimension == deal_II_space_dimension
 #  if deal_II_dimension > 1
     template