Merge pull request #4262 from roystgnr/failure_fixes

Fixes for devel->master test failures

Author: roystgnr

src/mesh/boundary_info.C

@@ -1540,7 +1540,6 @@ void BoundaryInfo::side_boundary_ids (const Elem * const elem,
   const Elem * searched_elem = elem;
 
 #ifdef LIBMESH_ENABLE_AMR
-
   if (elem->level() != 0)
   {
     // If we have children on the boundaries, we need to search for boundary IDs on the
@@ -1606,11 +1605,11 @@ void BoundaryInfo::side_boundary_ids (const Elem * const elem,
           vec_to_fill[pr.second.first].push_back(pr.second.second);
     return;
   }
+#endif
 
   // Check each element in the range to see if its side matches the requested side.
   for (const auto & pr : as_range(_boundary_side_id.equal_range(searched_elem)))
     vec_to_fill[pr.second.first].push_back(pr.second.second);
-#endif
 }
 
 void BoundaryInfo::boundary_ids (const Elem * const elem,

tests/mesh/boundary_info.C

@@ -625,7 +625,7 @@ public:
     BoundaryInfo & bi = mesh->get_boundary_info();
 
     // Now we add the extra boundary ID (5) to the element on side 3
-    auto elem = mesh->elem_ptr(0);
+    auto elem = mesh->query_elem_ptr(0);
     if (elem)
       bi.add_side(elem, 3, 5);
     mesh->prepare_for_use();