changed change reverse partition map signiture

SCOREC · Feb 1, 2025 · b3807f5 · b3807f5
1 parent ec90f79
commit b3807f5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/src/pcms/dummy_field_adapter.h b/src/pcms/dummy_field_adapter.h
@@ -8,7 +8,7 @@ class DummyFieldAdapter
   using value_type = int;
   [[nodiscard]] std::vector<GO> GetGids() const { return {}; }
   [[nodiscard]] ReversePartitionMap GetReversePartitionMap(
-    const redev::Partition& partition) const
+    const Partition& partition) const
   {
     return {};
   }

diff --git a/src/pcms/field_communicator.h b/src/pcms/field_communicator.h
@@ -5,6 +5,8 @@
 #include <numeric>
 #include "pcms/inclusive_scan.h"
 #include "pcms/profile.h"
+#include "pcms/partition.h"
+
 namespace pcms
 {
 
@@ -203,7 +205,7 @@ struct FieldCommunicator
       auto gids = field_adapter_.GetGids();
       if (redev_.GetProcessType() == redev::ProcessType::Client) {
         const ReversePartitionMap reverse_partition =
-          field_adapter_.GetReversePartitionMap(redev_.GetPartition());
+          field_adapter_.GetReversePartitionMap(Partition{redev_.GetPartition()});
         auto out_message = ConstructOutMessage(reverse_partition);
         comm_.SetOutMessageLayout(out_message.dest, out_message.offset);
         gid_comm_.SetOutMessageLayout(out_message.dest, out_message.offset);

diff --git a/src/pcms/omega_h_field.h b/src/pcms/omega_h_field.h
@@ -535,7 +535,7 @@ class OmegaHFieldAdapter
   }
   // REQUIRED
   [[nodiscard]] ReversePartitionMap GetReversePartitionMap(
-    const redev::Partition& partition) const
+    const Partition& partition) const
   {
     PCMS_FUNCTION_TIMER;
     auto classIds_h = Omega_h::HostRead<Omega_h::ClassId>(field_.GetClassIDs());
@@ -549,12 +549,11 @@ class OmegaHFieldAdapter
     std::array<pcms::Real, 3> coord;
     pcms::ReversePartitionMap reverse_partition;
     pcms::LO local_index = 0;
-    Partition part{partition};
     for (auto i = 0; i < classIds_h.size(); i++) {
       coord[0] = coords[i * dim];
       coord[1] = coords[i * dim + 1];
       coord[2] = (dim == 3) ? coords[i * dim + 2] : 0.0;
-      auto dr = part.GetDr(classIds_h[i], classDims_h[i], coord);
+      auto dr = partition.GetDr(classIds_h[i], classDims_h[i], coord);
       reverse_partition[dr].emplace_back(local_index++);
     }
     return reverse_partition;

diff --git a/src/pcms/partition.h b/src/pcms/partition.h
@@ -7,7 +7,7 @@ namespace pcms
 {
   struct GetRank
   {
-    GetRank(LO id, LO dim, std::array<Real,3>& coord)
+    GetRank(const LO id, const LO dim, const std::array<Real,3>& coord)
       : id_(id), dim_(dim), coord_(coord)
     {
       PCMS_FUNCTION_TIMER;
@@ -35,7 +35,7 @@ namespace pcms
       PCMS_FUNCTION_TIMER;
     }
 
-    auto GetDr(LO id, LO dim, std::array<Real,3> coord = {})
+    auto GetDr(const LO id, const LO dim, const std::array<Real,3> coord = {}) const
     {
       return std::visit(GetRank{id, dim, coord}, partition_);
     }

diff --git a/src/pcms/xgc_field_adapter.h b/src/pcms/xgc_field_adapter.h
@@ -112,20 +112,19 @@ class XGCFieldAdapter
 
   // REQUIRED
   [[nodiscard]] ReversePartitionMap GetReversePartitionMap(
-    const redev::Partition& partition) const
+    const Partition& partition) const
   {
     PCMS_FUNCTION_TIMER;
     if (RankParticipatesCouplingCommunication()) {
 
       pcms::ReversePartitionMap reverse_partition;
       // in_overlap_ must contain a function!
       PCMS_ALWAYS_ASSERT(static_cast<bool>(in_overlap_));
-      Partition part{partition};
       for (const auto& geom : reverse_classification_) {
         // if the geometry is in specified overlap region
         if (in_overlap_(geom.first.dim, geom.first.id)) {
 
-          auto dr = part.GetDr(geom.first.id, geom.first.dim);
+          auto dr = partition.GetDr(geom.first.id, geom.first.dim);
           auto [it, inserted] = reverse_partition.try_emplace(dr);
           // the map gives the local iteration order of the global ids
           auto map = mask_.GetMap();

diff --git a/test/test_ohClassPtn_appRibPtn.cpp b/test/test_ohClassPtn_appRibPtn.cpp
@@ -49,8 +49,6 @@ int main(int argc, char** argv)
                    static_cast<redev::ProcessType>(isRdv));
 
   const std::string name = "meshVtxIds";
-  const int rdvRanks = 2;
-  const int appRanks = 2;
 
   adios2::Params params{{"Streaming", "On"}, {"OpenTimeoutSecs", "60"}};
   auto channel =