rename template parameters

diff --git a/include/deal.II/cgal/intersections.h b/include/deal.II/cgal/intersections.h
index 1fa123668268a5a8929d8a772d289db2a25dc838..f9ef1757e772f00d80cfbe9d4ce6a65f5526139b 100644 (file)
--- a/include/deal.II/cgal/intersections.h
+++ b/include/deal.II/cgal/intersections.h
@@ -50,14 +50,14 @@ namespace CGALWrappers
    * @param tol Threshold to decide whether or not a simplex is included.
    * @return Vector of arrays, where each array identify a simplex by its vertices.
    */
-  template <int dim0, int dim1, int spacedim>
-  std::vector<std::array<Point<spacedim>, dim1 + 1>>
+  template <int structdim0, int structdim1, int spacedim>
+  std::vector<std::array<Point<spacedim>, structdim1 + 1>>
   compute_intersection_of_cells(
-    const typename Triangulation<dim0, spacedim>::cell_iterator &cell0,
-    const typename Triangulation<dim1, spacedim>::cell_iterator &cell1,
-    const Mapping<dim0, spacedim>                               &mapping0,
-    const Mapping<dim1, spacedim>                               &mapping1,
-    const double                                                 tol = 1e-9);
+    const typename Triangulation<structdim0, spacedim>::cell_iterator &cell0,
+    const typename Triangulation<structdim1, spacedim>::cell_iterator &cell1,
+    const Mapping<structdim0, spacedim>                               &mapping0,
+    const Mapping<structdim1, spacedim>                               &mapping1,
+    const double tol = 1e-9);
 
 
   /**
@@ -68,8 +68,8 @@ namespace CGALWrappers
    *
    * @note The vertices have to be given in CGAL order.
    */
-  template <int dim0, int dim1, int spacedim>
-  std::vector<std::array<Point<spacedim>, dim1 + 1>>
+  template <int structdim0, int structdim1, int spacedim>
+  std::vector<std::array<Point<spacedim>, structdim1 + 1>>
   compute_intersection_of_cells(
     const ArrayView<const Point<spacedim>> &vertices0,
     const ArrayView<const Point<spacedim>> &vertices1,

diff --git a/source/cgal/intersections.cc b/source/cgal/intersections.cc
index 48bfe32fb5514ed5fc32519b735a6a1b5b45d42a..a75999eaf1a8c8311b4a180a8488b5af827b0ab5 100644 (file)
--- a/source/cgal/intersections.cc
+++ b/source/cgal/intersections.cc
@@ -749,8 +749,8 @@ namespace CGALWrappers
   } // namespace internal
 
 
-  template <int dim0, int dim1, int spacedim>
-  std::vector<std::array<Point<spacedim>, dim1 + 1>>
+  template <int structdim0, int structdim1, int spacedim>
+  std::vector<std::array<Point<spacedim>, structdim1 + 1>>
   compute_intersection_of_cells(
     const ArrayView<const Point<spacedim>> &vertices0,
     const ArrayView<const Point<spacedim>> &vertices1,
@@ -764,7 +764,7 @@ namespace CGALWrappers
       ExcMessage(
         "The intersection cannot be computed as at least one of the two cells has no vertices."));
 
-    if constexpr (dim0 == 2 && dim1 == 2 && spacedim == 2)
+    if constexpr (structdim0 == 2 && structdim1 == 2 && spacedim == 2)
       {
         if (n_vertices0 == 4 && n_vertices1 == 4)
           {
@@ -773,7 +773,7 @@ namespace CGALWrappers
                                                             tol);
           }
       }
-    else if constexpr (dim0 == 2 && dim1 == 1 && spacedim == 2)
+    else if constexpr (structdim0 == 2 && structdim1 == 1 && spacedim == 2)
       {
         if (n_vertices0 == 4 && n_vertices1 == 2)
           {
@@ -782,7 +782,7 @@ namespace CGALWrappers
                                                             tol);
           }
       }
-    else if constexpr (dim0 == 3 && dim1 == 1 && spacedim == 3)
+    else if constexpr (structdim0 == 3 && structdim1 == 1 && spacedim == 3)
       {
         if (n_vertices0 == 8 && n_vertices1 == 2)
           {
@@ -791,7 +791,7 @@ namespace CGALWrappers
                                                             tol);
           }
       }
-    else if constexpr (dim0 == 3 && dim1 == 2 && spacedim == 3)
+    else if constexpr (structdim0 == 3 && structdim1 == 2 && spacedim == 3)
       {
         if (n_vertices0 == 8 && n_vertices1 == 4)
           {
@@ -800,7 +800,7 @@ namespace CGALWrappers
                                                             tol);
           }
       }
-    else if constexpr (dim0 == 3 && dim1 == 3 && spacedim == 3)
+    else if constexpr (structdim0 == 3 && structdim1 == 3 && spacedim == 3)
       {
         if (n_vertices0 == 8 && n_vertices1 == 8)
           {
@@ -819,20 +819,20 @@ namespace CGALWrappers
   }
 
 
-  template <int dim0, int dim1, int spacedim>
-  std::vector<std::array<Point<spacedim>, dim1 + 1>>
+  template <int structdim0, int structdim1, int spacedim>
+  std::vector<std::array<Point<spacedim>, structdim1 + 1>>
   compute_intersection_of_cells(
-    const typename Triangulation<dim0, spacedim>::cell_iterator &cell0,
-    const typename Triangulation<dim1, spacedim>::cell_iterator &cell1,
-    const Mapping<dim0, spacedim>                               &mapping0,
-    const Mapping<dim1, spacedim>                               &mapping1,
-    const double                                                 tol)
+    const typename Triangulation<structdim0, spacedim>::cell_iterator &cell0,
+    const typename Triangulation<structdim1, spacedim>::cell_iterator &cell1,
+    const Mapping<structdim0, spacedim>                               &mapping0,
+    const Mapping<structdim1, spacedim>                               &mapping1,
+    const double                                                       tol)
   {
     Assert(mapping0.get_vertices(cell0).size() ==
-             ReferenceCells::get_hypercube<dim0>().n_vertices(),
+             ReferenceCells::get_hypercube<structdim0>().n_vertices(),
            ExcNotImplemented());
     Assert(mapping1.get_vertices(cell1).size() ==
-             ReferenceCells::get_hypercube<dim1>().n_vertices(),
+             ReferenceCells::get_hypercube<structdim1>().n_vertices(),
            ExcNotImplemented());
 
     const auto &vertices0 =
@@ -840,9 +840,8 @@ namespace CGALWrappers
     const auto &vertices1 =
       CGALWrappers::get_vertices_in_cgal_order(cell1, mapping1);
 
-    return compute_intersection_of_cells<dim0, dim1, spacedim>(vertices0,
-                                                               vertices1,
-                                                               tol);
+    return compute_intersection_of_cells<structdim0, structdim1, spacedim>(
+      vertices0, vertices1, tol);
   }
 
 #  include "intersections.inst"
@@ -855,12 +854,12 @@ DEAL_II_NAMESPACE_CLOSE
 
 DEAL_II_NAMESPACE_OPEN
 
-template <int dim0,
-          int dim1,
+template <int structdim0,
+          int structdim1,
           int spacedim,
           int n_components0,
           int n_components1>
-std::vector<std::array<Point<spacedim>, dim1 + 1>>
+std::vector<std::array<Point<spacedim>, structdim1 + 1>>
 compute_intersection_of_cells(
   const std::array<Point<spacedim>, n_components0> &vertices0,
   const std::array<Point<spacedim>, n_components1> &vertices1,
@@ -872,14 +871,14 @@ compute_intersection_of_cells(
   AssertThrow(false, ExcNeedsCGAL());
 }
 
-template <int dim0, int dim1, int spacedim>
-std::vector<std::array<Point<spacedim>, dim1 + 1>>
+template <int structdim0, int structdim1, int spacedim>
+std::vector<std::array<Point<spacedim>, structdim1 + 1>>
 compute_intersection_of_cells(
-  const typename Triangulation<dim0, spacedim>::cell_iterator &cell0,
-  const typename Triangulation<dim1, spacedim>::cell_iterator &cell1,
-  const Mapping<dim0, spacedim>                               &mapping0,
-  const Mapping<dim1, spacedim>                               &mapping1,
-  const double                                                 tol)
+  const typename Triangulation<structdim0, spacedim>::cell_iterator &cell0,
+  const typename Triangulation<structdim1, spacedim>::cell_iterator &cell1,
+  const Mapping<structdim0, spacedim>                               &mapping0,
+  const Mapping<structdim1, spacedim>                               &mapping1,
+  const double                                                       tol)
 {
   (void)cell0;
   (void)cell1;

diff --git a/source/cgal/intersections.inst.in b/source/cgal/intersections.inst.in
index 47b1327a8bec7151bf7adf657c0f523af080417a..98de036407009be96dcf2de05ddec1a1a4513cef 100644 (file)
--- a/source/cgal/intersections.inst.in
+++ b/source/cgal/intersections.inst.in
@@ -15,20 +15,21 @@
 
 
 
-for (dim0 : DIMENSIONS; dim1 : DIMENSIONS; spacedim : SPACE_DIMENSIONS)
+for (structdim0 : DIMENSIONS; structdim1 : DIMENSIONS;
+     spacedim : SPACE_DIMENSIONS)
   {
-#if dim0 <= spacedim && dim0 >= dim1
+#if structdim0 <= spacedim && structdim0 >= structdim1
 
-    template std::vector<std::array<Point<spacedim>, dim1 + 1>>
-    compute_intersection_of_cells<dim0, dim1, spacedim>(
-      const typename Triangulation<dim0, spacedim>::cell_iterator &cell0,
-      const typename Triangulation<dim1, spacedim>::cell_iterator &cell1,
-      const Mapping<dim0, spacedim>                               &mapping0,
-      const Mapping<dim1, spacedim>                               &mapping1,
-      const double                                                 tol);
+    template std::vector<std::array<Point<spacedim>, structdim1 + 1>>
+    compute_intersection_of_cells<structdim0, structdim1, spacedim>(
+      const typename Triangulation<structdim0, spacedim>::cell_iterator &cell0,
+      const typename Triangulation<structdim1, spacedim>::cell_iterator &cell1,
+      const Mapping<structdim0, spacedim> &mapping0,
+      const Mapping<structdim1, spacedim> &mapping1,
+      const double                         tol);
 
-    template std::vector<std::array<Point<spacedim>, dim1 + 1>>
-    compute_intersection_of_cells<dim0, dim1, spacedim>(
+    template std::vector<std::array<Point<spacedim>, structdim1 + 1>>
+    compute_intersection_of_cells<structdim0, structdim1, spacedim>(
       const ArrayView<const Point<spacedim>> &vertices0,
       const ArrayView<const Point<spacedim>> &vertices1,
       const double                            tol);