Merge pull request #13709 from simonsticko/add_asserts_mesh_classifier

Add two asserts in NonMatching::MeshClassifier.

source/non_matching/mesh_classifier.cc

@@ -46,6 +46,16 @@ namespace NonMatching
   {
     namespace MeshClassifierImplementation
     {
+      DeclExceptionMsg(
+        ReclassifyNotCalled,
+        "The Triangulation has not been classified. You need to call the "
+        "reclassify()-function before using this function.");
+
+      DeclExceptionMsg(
+        ExcTriangulationMismatch,
+        "The incoming cell does not belong to the triangulation passed to "
+        "the constructor.");
+
       /**
        * Return LocationToLevelSet::inside/outside if all values in incoming
        * vector are negative/positive, otherwise return
@@ -419,6 +429,11 @@ namespace NonMatching
   MeshClassifier<dim>::location_to_level_set(
     const typename Triangulation<dim>::cell_iterator &cell) const
   {
+    Assert(cell_locations.size() == triangulation->n_active_cells(),
+           internal::MeshClassifierImplementation::ReclassifyNotCalled());
+    Assert(&cell->get_triangulation() == triangulation,
+           internal::MeshClassifierImplementation::ExcTriangulationMismatch());
+
     return cell_locations.at(cell->active_cell_index());
   }
 
@@ -431,6 +446,10 @@ namespace NonMatching
     const unsigned int                                face_index) const
   {
     AssertIndexRange(face_index, GeometryInfo<dim>::faces_per_cell);
+    Assert(face_locations.size() == triangulation->n_raw_faces(),
+           internal::MeshClassifierImplementation::ReclassifyNotCalled());
+    Assert(&cell->get_triangulation() == triangulation,
+           internal::MeshClassifierImplementation::ExcTriangulationMismatch());
 
     return face_locations.at(cell->face(face_index)->index());
   }

tests/non_matching/mesh_classifier.cc

@@ -73,15 +73,15 @@ print_cell_and_face_locations(
   const NonMatching::MeshClassifier<dim> &                 classifier,
   const typename Triangulation<dim>::active_cell_iterator &cell)
 {
-  const NonMatching::LocationToLevelSet cell_position =
+  const NonMatching::LocationToLevelSet cell_location =
     classifier.location_to_level_set(cell);
-  deallog << "cell " << location_to_string(cell_position) << std::endl;
+  deallog << "cell " << location_to_string(cell_location) << std::endl;
 
-  for (unsigned int i = 0; i < GeometryInfo<dim>::faces_per_cell; ++i)
+  for (unsigned int f : cell->face_indices())
     {
-      const NonMatching::LocationToLevelSet cell_position =
-        classifier.location_to_level_set(cell, i);
-      deallog << "face " << i << ' ' << location_to_string(cell_position)
+      const NonMatching::LocationToLevelSet face_location =
+        classifier.location_to_level_set(cell, f);
+      deallog << "face " << f << ' ' << location_to_string(face_location)
               << std::endl;
     }
 }