Merge pull request #4067 from pnorbert/fix-campaign-minmax

Add minmax and shape functions to CampaignReader, so that per-block i…
ornladios · Mar 2, 2024 · 4ea9e1c · 4ea9e1c
2 parents 6eff222 + aa8fcdf
commit 4ea9e1c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/source/adios2/engine/campaign/CampaignReader.cpp b/source/adios2/engine/campaign/CampaignReader.cpp
@@ -351,6 +351,31 @@ MinVarInfo *CampaignReader::MinBlocksInfo(const VariableBase &Var, size_t Step)
     return nullptr;
 }
 
+bool CampaignReader::VarShape(const VariableBase &Var, const size_t Step, Dims &Shape) const
+{
+    auto it = m_VarInternalInfo.find(Var.m_Name);
+    if (it != m_VarInternalInfo.end())
+    {
+        VariableBase *vb = reinterpret_cast<VariableBase *>(it->second.originalVar);
+        Engine *e = m_Engines[it->second.engineIdx];
+        return e->VarShape(*vb, Step, Shape);
+    }
+    return false;
+}
+
+bool CampaignReader::VariableMinMax(const VariableBase &Var, const size_t Step,
+                                    MinMaxStruct &MinMax)
+{
+    auto it = m_VarInternalInfo.find(Var.m_Name);
+    if (it != m_VarInternalInfo.end())
+    {
+        VariableBase *vb = reinterpret_cast<VariableBase *>(it->second.originalVar);
+        Engine *e = m_Engines[it->second.engineIdx];
+        return e->VariableMinMax(*vb, Step, MinMax);
+    }
+    return false;
+}
+
 #define declare_type(T)                                                                            \
     void CampaignReader::DoGetSync(Variable<T> &variable, T *data)                                 \
     {                                                                                              \

diff --git a/source/adios2/engine/campaign/CampaignReader.h b/source/adios2/engine/campaign/CampaignReader.h
@@ -50,6 +50,8 @@ class CampaignReader : public Engine
     void EndStep() final;
 
     MinVarInfo *MinBlocksInfo(const VariableBase &, const size_t Step) const;
+    bool VarShape(const VariableBase &Var, const size_t Step, Dims &Shape) const;
+    bool VariableMinMax(const VariableBase &, const size_t Step, MinMaxStruct &MinMax);
 
 private:
     int m_Verbosity = 0;              // runtime parameter Verbose