Merge branch 'develop' into lroberts36/fix-static-refinement

parthenon-hpc-lab · May 15, 2024 · a0c92b1 · a0c92b1
2 parents d285155 + dfda73b
commit a0c92b1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/mesh/mesh.cpp b/src/mesh/mesh.cpp
@@ -599,12 +599,11 @@ Mesh::Mesh(ParameterInput *pin, ApplicationInput *app_in, RestartReader &rr,
   auto locLevelGidLidCnghostGflag = mesh_info.level_gid_lid_cnghost_gflag;
   current_level = -1;
   for (int i = 0; i < nbtotal; i++) {
-    loclist[i] = LogicalLocation(locLevelGidLidCnghostGflag[6 * i], lx123[3 * i],
-                                 lx123[3 * i + 1], lx123[3 * i + 2]);
+    loclist[i] = LogicalLocation(locLevelGidLidCnghostGflag[NumIDsAndFlags * i],
+                                 lx123[3 * i], lx123[3 * i + 1], lx123[3 * i + 2]);
   }
 
   // rebuild the Block Tree
-
   for (int i = 0; i < nbtotal; i++) {
     forest.AddMeshBlock(forest.GetForestLocationFromLegacyTreeLocation(loclist[i]),
                         false);
@@ -695,7 +694,7 @@ Mesh::Mesh(ParameterInput *pin, ApplicationInput *app_in, RestartReader &rr,
                         packages, resolved_packages, gflag, costlist[i]);
     if (block_list[i - nbs]->pmr)
       block_list[i - nbs]->pmr->DerefinementCount() =
-          locLevelGidLidCnghostGflag[6 * i + 5];
+          locLevelGidLidCnghostGflag[NumIDsAndFlags * i + 5];
   }
   BuildGMGBlockLists(pin, app_in);
   SetMeshBlockNeighbors(GridIdentifier::leaf(), block_list, ranklist);

diff --git a/src/outputs/outputs.hpp b/src/outputs/outputs.hpp
@@ -198,7 +198,7 @@ class PHDF5Output : public OutputType {
   void WriteLevelsAndLocs_(Mesh *pm, hid_t file, const HDF5::H5P &pl, hsize_t offset,
                            hsize_t max_blocks_global) const;
   void WriteSparseInfo_(Mesh *pm, hbool_t *sparse_allocated,
-                        const std::vector<int> dealloc_count,
+                        const std::vector<int> &dealloc_count,
                         const std::vector<std::string> &sparse_names, hsize_t num_sparse,
                         hid_t file, const HDF5::H5P &pl, size_t offset,
                         hsize_t max_blocks_global) const;

diff --git a/src/outputs/parthenon_hdf5.cpp b/src/outputs/parthenon_hdf5.cpp
@@ -40,6 +40,7 @@
 #include "outputs/outputs.hpp"
 #include "outputs/parthenon_hdf5.hpp"
 #include "outputs/parthenon_xdmf.hpp"
+#include "outputs/restart.hpp"
 #include "utils/string_utils.hpp"
 
 namespace parthenon {
@@ -596,8 +597,8 @@ void PHDF5Output::WriteBlocksMetadata_(Mesh *pm, hid_t file, const HDF5::H5P &pl
 
   {
     // (LOC.)level, GID, LID, cnghost, gflag
-    hsize_t loc_cnt[2] = {num_blocks_local, 6};
-    hsize_t glob_cnt[2] = {max_blocks_global, 6};
+    hsize_t loc_cnt[2] = {num_blocks_local, NumIDsAndFlags};
+    hsize_t glob_cnt[2] = {max_blocks_global, NumIDsAndFlags};
     std::vector<int> tmpID = OutputUtils::ComputeIDsAndFlags(pm);
     HDF5Write2D(gBlocks, "loc.level-gid-lid-cnghost-gflag", tmpID.data(), &loc_offset[0],
                 &loc_cnt[0], &glob_cnt[0], pl);
@@ -662,7 +663,7 @@ void PHDF5Output::WriteLevelsAndLocs_(Mesh *pm, hid_t file, const HDF5::H5P &pl,
 }
 
 void PHDF5Output::WriteSparseInfo_(Mesh *pm, hbool_t *sparse_allocated,
-                                   const std::vector<int> dealloc_count,
+                                   const std::vector<int> &dealloc_count,
                                    const std::vector<std::string> &sparse_names,
                                    hsize_t num_sparse, hid_t file, const HDF5::H5P &pl,
                                    size_t offset, hsize_t max_blocks_global) const {

diff --git a/src/outputs/restart.hpp b/src/outputs/restart.hpp
@@ -35,6 +35,8 @@ namespace parthenon {
 class Mesh;
 class Param;
 
+constexpr int NumIDsAndFlags{6};
+
 class RestartReader {
  public:
   RestartReader() = default;