Make CellData::vertices to std::vector

doc/news/changes/minor/20200531Munch

@@ -0,0 +1,4 @@
+Changed: The vertices in CellData are now stored in form of a std::vector
+instead of C-style array.
+<br>
+(Peter Munch, 2020/05/31)

include/deal.II/grid/tria_description.h

@@ -71,7 +71,7 @@ struct CellData
    * to entries in the vector of vertex locations passed to
    * Triangulation::create_triangulation().
    */
-  unsigned int vertices[GeometryInfo<structdim>::vertices_per_cell];
+  std::vector<unsigned int> vertices;
 
   /**
    * Material or boundary indicator of this cell.

source/grid/tria.cc

@@ -1747,9 +1747,11 @@ namespace internal
                 // throw an exception if no such cells should exist.
                 if (!triangulation.check_for_distorted_cells)
                   {
-                    const double cell_measure =
-                      GridTools::cell_measure<1>(triangulation.vertices,
-                                                 cells[cell_no].vertices);
+                    const double cell_measure = GridTools::cell_measure<1>(
+                      triangulation.vertices,
+                      reinterpret_cast<const unsigned int(
+                          &)[GeometryInfo<1>::vertices_per_cell]>(
+                        cells[cell_no].vertices.front()));
                     AssertThrow(cell_measure > 0,
                                 ExcGridHasInvalidCell(cell_no));
                   }
@@ -1930,9 +1932,11 @@ namespace internal
                 // See the note in the 1D function on this if statement.
                 if (!triangulation.check_for_distorted_cells)
                   {
-                    const double cell_measure =
-                      GridTools::cell_measure<2>(triangulation.vertices,
-                                                 cells[cell_no].vertices);
+                    const double cell_measure = GridTools::cell_measure<2>(
+                      triangulation.vertices,
+                      reinterpret_cast<const unsigned int(
+                          &)[GeometryInfo<2>::vertices_per_cell]>(
+                        cells[cell_no].vertices.front()));
                     AssertThrow(cell_measure > 0,
                                 ExcGridHasInvalidCell(cell_no));
                   }
@@ -2305,9 +2309,11 @@ namespace internal
             // See the note in the 1D function on this if statement.
             if (!triangulation.check_for_distorted_cells)
               {
-                const double cell_measure =
-                  GridTools::cell_measure<3>(triangulation.vertices,
-                                             cells[cell_no].vertices);
+                const double cell_measure = GridTools::cell_measure<3>(
+                  triangulation.vertices,
+                  reinterpret_cast<
+                    const unsigned int(&)[GeometryInfo<3>::vertices_per_cell]>(
+                    cells[cell_no].vertices.front()));
                 AssertThrow(cell_measure > 0, ExcGridHasInvalidCell(cell_no));
               }
           }
@@ -10494,8 +10500,23 @@ Triangulation<dim, spacedim>::create_triangulation(
   // because sometimes other objects are already attached to it:
   try
     {
-      internal::TriangulationImplementation::Implementation::
-        create_triangulation(v, cells, subcelldata, *this);
+      const bool arbitray_mesh_provided =
+        std::any_of(cells.begin(), cells.end(), [](const auto &cell) {
+          return cell.vertices.size() != GeometryInfo<dim>::vertices_per_cell;
+        });
+
+      if (arbitray_mesh_provided == false)
+        {
+          internal::TriangulationImplementation::Implementation::
+            create_triangulation(v, cells, subcelldata, *this);
+        }
+      else
+        {
+          Assert(
+            false,
+            ExcMessage(
+              "A cell with invalid number of vertices has been provided."));
+        }
     }
   catch (...)
     {

source/grid/tria_description.cc

@@ -30,13 +30,11 @@ DEAL_II_NAMESPACE_OPEN
 
 template <int structdim>
 CellData<structdim>::CellData()
-  : material_id(0)
+  : vertices(GeometryInfo<structdim>::vertices_per_cell,
+             numbers::invalid_unsigned_int)
+  , material_id(0)
   , manifold_id(numbers::flat_manifold_id)
-{
-  std::fill(std::begin(vertices),
-            std::end(vertices),
-            numbers::invalid_unsigned_int);
-}
+{}
 
 
 

tests/serialization/cell_data_1.output

@@ -1,54 +1,54 @@
 
-DEAL::0 0 2 0 1 1 1 2
+DEAL::0 0 2 0 0 1 1 1 2
 
-DEAL::0 0 2 0 1 1 1 2
+DEAL::0 0 2 0 0 1 1 1 2
 
-DEAL::0 0 2 0 1 1 1 2
+DEAL::0 0 2 0 0 1 1 1 2
 
-DEAL::0 0 2 0 1 1 1 2
+DEAL::0 0 2 0 0 1 1 1 2
 
-DEAL::0 0 2 0 1 1 1 2
+DEAL::0 0 2 0 0 1 1 1 2
 
-DEAL::0 0 2 0 1 1 1 2
+DEAL::0 0 2 0 0 1 1 1 2
 
-DEAL::0 0 4 0 1 2 3 1 1 2
+DEAL::0 0 4 0 0 1 2 3 1 1 2
 
-DEAL::0 0 4 0 1 2 3 1 1 2
+DEAL::0 0 4 0 0 1 2 3 1 1 2
 
-DEAL::0 0 4 0 1 2 3 1 1 2
+DEAL::0 0 4 0 0 1 2 3 1 1 2
 
-DEAL::0 0 4 0 1 2 3 1 1 2
+DEAL::0 0 4 0 0 1 2 3 1 1 2
 
-DEAL::0 0 4 0 1 2 3 1 1 2
+DEAL::0 0 4 0 0 1 2 3 1 1 2
 
-DEAL::0 0 4 0 1 2 3 1 1 2
+DEAL::0 0 4 0 0 1 2 3 1 1 2
 
-DEAL::0 0 4 0 1 2 3 1 1 2
+DEAL::0 0 4 0 0 1 2 3 1 1 2
 
-DEAL::0 0 4 0 1 2 3 1 1 2
+DEAL::0 0 4 0 0 1 2 3 1 1 2
 
-DEAL::0 0 8 0 1 2 3 4 5 6 7 1 1 2
+DEAL::0 0 8 0 0 1 2 3 4 5 6 7 1 1 2
 
-DEAL::0 0 8 0 1 2 3 4 5 6 7 1 1 2
+DEAL::0 0 8 0 0 1 2 3 4 5 6 7 1 1 2
 
-DEAL::0 0 8 0 1 2 3 4 5 6 7 1 1 2
+DEAL::0 0 8 0 0 1 2 3 4 5 6 7 1 1 2
 
-DEAL::0 0 8 0 1 2 3 4 5 6 7 1 1 2
+DEAL::0 0 8 0 0 1 2 3 4 5 6 7 1 1 2
 
-DEAL::0 0 8 0 1 2 3 4 5 6 7 1 1 2
+DEAL::0 0 8 0 0 1 2 3 4 5 6 7 1 1 2
 
-DEAL::0 0 8 0 1 2 3 4 5 6 7 1 1 2
+DEAL::0 0 8 0 0 1 2 3 4 5 6 7 1 1 2
 
-DEAL::0 0 8 0 1 2 3 4 5 6 7 1 1 2
+DEAL::0 0 8 0 0 1 2 3 4 5 6 7 1 1 2
 
-DEAL::0 0 8 0 1 2 3 4 5 6 7 1 1 2
+DEAL::0 0 8 0 0 1 2 3 4 5 6 7 1 1 2
 
-DEAL::0 0 8 0 1 2 3 4 5 6 7 1 1 2
+DEAL::0 0 8 0 0 1 2 3 4 5 6 7 1 1 2
 
-DEAL::0 0 8 0 1 2 3 4 5 6 7 1 1 2
+DEAL::0 0 8 0 0 1 2 3 4 5 6 7 1 1 2
 
-DEAL::0 0 8 0 1 2 3 4 5 6 7 1 1 2
+DEAL::0 0 8 0 0 1 2 3 4 5 6 7 1 1 2
 
-DEAL::0 0 8 0 1 2 3 4 5 6 7 1 1 2
+DEAL::0 0 8 0 0 1 2 3 4 5 6 7 1 1 2
 
 DEAL::OK