Merge pull request #3583 from roystgnr/exodus_sideset_checks

Exodus sideset checks

Author: roystgnr

src/mesh/boundary_info.C

@@ -970,6 +970,9 @@ void BoundaryInfo::add_edge(const Elem * elem,
   // Only add BCs for level-0 elements.
   libmesh_assert_equal_to (elem->level(), 0);
 
+  // Only add BCs for edges that exist.
+  libmesh_assert_less (edge, elem->n_edges());
+
   libmesh_error_msg_if(id == invalid_id,
                        "ERROR: You may not set a boundary ID of "
                        << invalid_id
@@ -1000,6 +1003,9 @@ void BoundaryInfo::add_edge(const Elem * elem,
   // Only add BCs for level-0 elements.
   libmesh_assert_equal_to (elem->level(), 0);
 
+  // Only add BCs for edges that exist.
+  libmesh_assert_less (edge, elem->n_edges());
+
   // Don't add the same ID twice
   auto bounds = _boundary_edge_id.equal_range(elem);
 
@@ -1145,6 +1151,10 @@ void BoundaryInfo::add_side(const Elem * elem,
                             const boundary_id_type id)
 {
   libmesh_assert(elem);
+
+  // Only add BCs for sides that exist.
+  libmesh_assert_less (side, elem->n_sides());
+
   libmesh_error_msg_if(id == invalid_id, "ERROR: You may not set a boundary ID of "
                        << invalid_id
                        << "\n That is reserved for internal use.");
@@ -1191,6 +1201,9 @@ void BoundaryInfo::add_side(const Elem * elem,
 
   libmesh_assert(elem);
 
+  // Only add BCs for sides that exist.
+  libmesh_assert_less (side, elem->n_sides());
+
 #ifdef LIBMESH_ENABLE_AMR
   // Users try to mark boundary on child elements
   // If this happens, we will allow users to remove
@@ -1291,6 +1304,9 @@ void BoundaryInfo::edge_boundary_ids (const Elem * const elem,
   // Clear out any previous contents
   vec_to_fill.clear();
 
+  // Only query BCs for edges that exist.
+  libmesh_assert_less (edge, elem->n_edges());
+
   // Only level-0 elements store BCs.  If this is not a level-0
   // element get its level-0 parent and infer the BCs.
   const Elem * searched_elem = elem;
@@ -1355,6 +1371,9 @@ void BoundaryInfo::raw_edge_boundary_ids (const Elem * const elem,
 {
   libmesh_assert(elem);
 
+  // Only query BCs for edges that exist.
+  libmesh_assert_less (edge, elem->n_edges());
+
   // Clear out any previous contents
   vec_to_fill.clear();
 
@@ -1455,6 +1474,9 @@ void BoundaryInfo::boundary_ids (const Elem * const elem,
 {
   libmesh_assert(elem);
 
+  // Only query BCs for sides that exist.
+  libmesh_assert_less (side, elem->n_sides());
+
   // Clear out any previous contents
   vec_to_fill.clear();
 
@@ -1547,6 +1569,9 @@ void BoundaryInfo::raw_boundary_ids (const Elem * const elem,
 {
   libmesh_assert(elem);
 
+  // Only query BCs for sides that exist.
+  libmesh_assert_less (side, elem->n_sides());
+
   // Clear out any previous contents
   vec_to_fill.clear();
 
@@ -1632,6 +1657,9 @@ void BoundaryInfo::remove_edge (const Elem * elem,
 {
   libmesh_assert(elem);
 
+  // Only touch BCs for edges that exist.
+  libmesh_assert_less (edge, elem->n_edges());
+
   // Only level 0 elements are stored in BoundaryInfo.
   libmesh_assert_equal_to (elem->level(), 0);
 
@@ -1649,6 +1677,9 @@ void BoundaryInfo::remove_edge (const Elem * elem,
 {
   libmesh_assert(elem);
 
+  // Only touch BCs for edges that exist.
+  libmesh_assert_less (edge, elem->n_edges());
+
   // Only level 0 elements are stored in BoundaryInfo.
   libmesh_assert_equal_to (elem->level(), 0);
 
@@ -1701,6 +1732,9 @@ void BoundaryInfo::remove_side (const Elem * elem,
 {
   libmesh_assert(elem);
 
+  // Only touch BCs for sides that exist.
+  libmesh_assert_less (side, elem->n_sides());
+
   // Erase (elem, side, *) entries from map.
   erase_if(_boundary_side_id, elem,
            [side](decltype(_boundary_side_id)::mapped_type & pr)
@@ -1715,6 +1749,9 @@ void BoundaryInfo::remove_side (const Elem * elem,
 {
   libmesh_assert(elem);
 
+  // Only touch BCs for sides that exist.
+  libmesh_assert_less (side, elem->n_sides());
+
 #ifdef LIBMESH_ENABLE_AMR
   // Here we have to stop and check if somebody tries to remove an ancestor's boundary ID
   // through a child

src/mesh/exodusII_io.C

@@ -699,11 +699,11 @@ void ExodusII_IO::read (const std::string & fname)
             int mapped_shellface = raw_side_index;
 
             // Check for errors
-            libmesh_error_msg_if(mapped_shellface == ExodusII_IO_Helper::Conversion::invalid_id,
-                                 "Invalid 1-based side id: "
+            libmesh_error_msg_if(mapped_shellface < 0 || mapped_shellface >= 2,
+                                 "Bad 0-based shellface id: "
                                  << mapped_shellface
-                                 << " detected for "
-                                 << Utility::enum_to_string(elem.type()));
+                                 << " detected in Exodus file "
+                                 << exio_helper->current_filename);
 
             // Add this (elem,shellface,id) triplet to the BoundaryInfo object.
             mesh.get_boundary_info().add_shellface (libmesh_elem_id,
@@ -720,7 +720,18 @@ void ExodusII_IO::read (const std::string & fname)
                                  "Invalid 1-based side id: "
                                  << side_index
                                  << " detected for "
-                                 << Utility::enum_to_string(elem.type()));
+                                 << Utility::enum_to_string(elem.type())
+                                 << " in Exodus file "
+                                 << exio_helper->current_filename);
+
+            libmesh_error_msg_if(mapped_side < 0 ||
+                                 cast_int<unsigned int>(mapped_side) >= elem.n_sides(),
+                                 "Bad 0-based side id: "
+                                 << mapped_side
+                                 << " detected for "
+                                 << Utility::enum_to_string(elem.type())
+                                 << " in Exodus file "
+                                 << exio_helper->current_filename);
 
             // Add this (elem,side,id) triplet to the BoundaryInfo object.
             mesh.get_boundary_info().add_side (libmesh_elem_id,