Bug in CellDataStorage::erase() fixed

diff --git a/include/deal.II/base/quadrature_point_data.h b/include/deal.II/base/quadrature_point_data.h
index f0a08bd99b87880832721cb33922fe3fdcc61774..154ce61bf000e127353cdcd9d211063770a085bb 100644 (file)
--- a/include/deal.II/base/quadrature_point_data.h
+++ b/include/deal.II/base/quadrature_point_data.h
@@ -559,6 +559,8 @@ bool
 CellDataStorage<CellIteratorType, DataType>::erase(const CellIteratorType &cell)
 {
   const auto it = map.find(cell);
+  if (it == map.end())
+    return false;
   for (unsigned int i = 0; i < it->second.size(); i++)
     {
       Assert(

diff --git a/tests/base/cell_data_storage_02.cc b/tests/base/cell_data_storage_02.cc
index b01f6b376fc3c5e8d0a00c63bfd7f6b8f4fc1f1b..422ddbcc8740739916f31fb3522db3c44075f314 100644 (file)
--- a/tests/base/cell_data_storage_02.cc
+++ b/tests/base/cell_data_storage_02.cc
@@ -102,6 +102,10 @@ test()
           fe_values.reinit(dof_cell);
           const std::vector<Point<dim>> &q_points =
             fe_values.get_quadrature_points();
+          // before initialization, you can erase it without any consequences
+          const bool erased_nonexisting_data = data_storage.erase(cell);
+          Assert(!erased_nonexisting_data, ExcInternalError());
+          // initialize
           data_storage.initialize(cell, rhs.size());
           {
             std::vector<std::shared_ptr<MyQData>> qpd =