Merge pull request #15611 from masterleinad/remove_deprecated_cellmes…

…aure_gridreordering Remove deprecated functions in GridReordering
dealii · Jul 3, 2023 · 80c4fc3 · 80c4fc3
2 parents acb9075 + fd0c356
commit 80c4fc3
Show file tree

Hide file tree

Showing 54 changed files with 150 additions and 434 deletions.
diff --git a/doc/news/changes/incompatibilities/20230703DanielArndt b/doc/news/changes/incompatibilities/20230703DanielArndt
@@ -0,0 +1,5 @@
+Removed: The deprecated functions GridReordering::reorder_cells()
+and GridReordering::invert_all_cells_of_negative_grid()
+have been removed.
+<br>
+(Daniel Arndt, 2023/07/03)
diff --git a/include/deal.II/base/geometry_info.h b/include/deal.II/base/geometry_info.h
@@ -1633,9 +1633,10 @@ struct GeometryInfo<0>
  * Before a list of cells is passed to an object of the Triangulation class
  * for creation of a triangulation, you therefore have to make sure that cells
  * are oriented in a compatible fashion, so that edge directions are globally
- * according to above convention. However, the GridReordering class can do
- * this for you, by reorienting cells and edges of an arbitrary list of input
- * cells that need not be already sorted.
+ * according to above convention. However, the
+ * GridTools::consistently_order_cells() function can do this for you, by
+ * reorienting cells and edges of an arbitrary list of input cells that need not
+ * be already sorted.
  *
  * <h4>Faces</h4>
  *

diff --git a/include/deal.II/grid/grid_in.h b/include/deal.II/grid/grid_in.h
@@ -278,11 +278,11 @@ struct CellData;
  * have orientations that need to be taken care of.
  *
  * For this reason, the <tt>read_*</tt> functions of this class that read in
- * grids in various input formats call the GridReordering class to bring the
- * order of vertices that define the cells into an ordering that satisfies the
- * requirements of the Triangulation class. Be sure to read the documentation
- * of that class if you experience unexpected problems when reading grids
- * through this class.
+ * grids in various input formats call the GridTools::consistently_order_cells()
+ * function to bring the order of vertices that define the cells into an
+ * ordering that satisfies the requirements of the Triangulation class. Be sure
+ * to read the documentation of that class if you experience unexpected problems
+ * when reading grids through this class.
  *
  *
  * <h3>Dealing with distorted mesh cells</h3>

diff --git a/include/deal.II/grid/grid_reordering.h b/include/deal.II/grid/grid_reordering.h
diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h
@@ -3828,24 +3828,20 @@ namespace GridTools
                  << "The given vertex with index " << arg1
                  << " is not used in the given triangulation.");
 
+  /**
+   * An exception that is thrown whenever the edges of a mesh are not
+   * orientable.
+   *
+   * @ingroup Exceptions
+   */
+  DeclExceptionMsg(ExcMeshNotOrientable,
+                   "The edges of the mesh are not consistently orientable.");
+
   /** @} */
 
 } /*namespace GridTools*/
 
 
-/**
- * An exception that is thrown whenever the edges of a mesh are not
- * orientable.
- *
- * @note for backwards compatibility with the old GridReordering class this
- * exception is not in the GridTools namespace.
- *
- * @ingroup Exceptions
- */
-DeclExceptionMsg(ExcMeshNotOrientable,
-                 "The edges of the mesh are not consistently orientable.");
-
-
 
 /* ----------------- Template function --------------- */
 

diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h
@@ -555,9 +555,9 @@ namespace internal
  * numbering within cells. They do not only hold for the data read from an UCD
  * or any other input file, but also for the data passed to
  * create_triangulation(). See the documentation for the GridIn class for more
- * details on this, and above all to the GridReordering class that explains
- * many of the problems and an algorithm to reorder cells such that they
- * satisfy the conditions outlined above.
+ * details on this, and above all to the GridTools::consistently_order_cells()
+ * function that explains many of the problems and an algorithm to reorder cells
+ * such that they satisfy the conditions outlined above.
  *
  * <li> Copying a triangulation: when computing on time dependent meshes or
  * when using adaptive refinement, you will often want to create a new
@@ -1838,7 +1838,8 @@ class Triangulation : public Subscriptor
    * constraints; see the general class documentation for this.
    *
    * For conditions when this function can generate a valid triangulation, see
-   * the documentation of this class, and the GridIn and GridReordering class.
+   * the documentation of this class, and the GridIn and
+   * GridTools::consistently_order_cells() function.
    *
    * If the <code>check_for_distorted_cells</code> flag was specified upon
    * creation of this object, at the very end of its operation, the current

diff --git a/source/grid/CMakeLists.txt b/source/grid/CMakeLists.txt
@@ -33,7 +33,6 @@ endif()
 set(_unity_include_src
   cell_id.cc
   grid_refinement.cc
-  grid_reordering.cc
   intergrid_map.cc
   manifold.cc
   manifold_lib.cc

diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc
@@ -22,7 +22,6 @@
 
 #include <deal.II/grid/filtered_iterator.h>
 #include <deal.II/grid/grid_generator.h>
-#include <deal.II/grid/grid_reordering.h>
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/intergrid_map.h>
 #include <deal.II/grid/manifold_lib.h>

diff --git a/source/grid/grid_in.cc b/source/grid/grid_in.cc
@@ -20,7 +20,6 @@
 #include <deal.II/base/utilities.h>
 
 #include <deal.II/grid/grid_in.h>
-#include <deal.II/grid/grid_reordering.h>
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/tria.h>