Merge pull request #1064 from parthenon-hpc-lab/jmm/add-fail-on-edge-…

…case

add fail on edge case in Mesh Data

CHANGELOG.md

@@ -19,6 +19,7 @@
 - [[PR 1031]](https://github.com/parthenon-hpc-lab/parthenon/pull/1031) Fix bug in non-cell centered AMR
 
 ### Infrastructure (changes irrelevant to downstream codes)
+- [[PR 1064]](https://github.com/parthenon-hpc-lab/parthenon/pull/1064) Forbid erroneous edge case when adding MeshData on a partition
 - [[PR 1035]](https://github.com/parthenon-hpc-lab/parthenon/pull/1035) Fix multigrid infrastructure to work with forest
 - [[PR 1048]](https://github.com/parthenon-hpc-lab/parthenon/pull/1048) Tiny fixes to custom coords logic
 - [[PR 1028]](https://github.com/parthenon-hpc-lab/parthenon/pull/1028) Internal reorganization of LogicalLocation files

src/interface/mesh_data.cpp

@@ -36,6 +36,11 @@ void MeshData<T>::Set(BlockList_t blocks, Mesh *pmesh) {
   Set(blocks, pmesh, ndim);
 }
 
+template <typename T>
+bool MeshData<T>::BlockDataIsWholeRank_() const {
+  return block_data_.size() == (pmy_mesh_->block_list).size();
+}
+
 template class MeshData<Real>;
 
 } // namespace parthenon

src/interface/mesh_data.hpp

@@ -262,6 +262,9 @@ class MeshData {
     // modifying DataCollection::GetOrAdd. In the future we should
     // make that "just work (tm)."
     grid = src->grid;
+    PARTHENON_REQUIRE((grid.type == GridType::two_level_composite) ||
+                          src->BlockDataIsWholeRank_(),
+                      "Add may only be called on all blocks on a rank");
     for (int i = 0; i < nblocks; ++i) {
       auto pmbd = src->GetBlockData(i);
       block_data_[i] = pmbd->GetBlockSharedPointer()->meshblock_data.Add(
@@ -460,6 +463,8 @@ class MeshData {
   SparsePackCache &GetSparsePackCache() { return sparse_pack_cache_; }
 
  private:
+  bool BlockDataIsWholeRank_() const;
+
   int ndim_;
   Mesh *pmy_mesh_;
   BlockDataList_t<T> block_data_;