Changeset 2291 for XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_transform_connector.hpp

Timestamp:

02/01/22 15:28:48 (2 years ago)

Author:

ymipsl

Message:

Improve reduction transformation

• make the difference between reduction over geometry or reduction between process.

• geometrical reduction :

domain -> axis
axis -> scalar
domain -> scalar

• reduction across processes for redondant geometrical cell :

axis -> axis
scalar -> scalar

Reduction can be local (only for the geometrical cell owned by current process) or global, using the "local" attribute (bool) over the reduction.

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_transform_connector.hpp (modified) (4 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_transform_connector.hpp

@@ -8 +8 @@
 #include "grid_scatterer_connector.hpp"
 #include "grid_gatherer_connector.hpp"
+#include "reduction_types.hpp"
 #include "mpi.hpp"
 
@@ -20 +21 @@
       CGridTransformConnector(vector<shared_ptr<CLocalView>> srcViews, vector<shared_ptr<CLocalView>> remoteViews, MPI_Comm localComm) 
                           : srcViews_(srcViews), remoteViews_(remoteViews), localComm_(localComm) 
-                          { computeConnector();}
+                          { }
     
-      void computeConnector(void) ; 
+      void computeConnector(bool eliminateRedundant=true) ; 
     protected:
      MPI_Comm localComm_ ;
@@ -36 +37 @@
     public:
       template<typename T> 
-      void transfer(const CArray<T,1>& dataIn, CArray<T,1>& dataOut)
+      void transfer(const CArray<T,1>& dataIn, CArray<T,1>& dataOut, EReduction op = EReduction::none)
       {
         map<int,CArray<T,1>> tmpArrayIn ;
@@ -62 +63 @@
         
         const double nanValue = std::numeric_limits<double>::quiet_NaN();
-        gridGathererConnector_->transfer(tmpArrayOut, dataOut, nanValue) ;
+
+        if (op == EReduction::none) gridGathererConnector_->transfer(tmpArrayOut, dataOut, nanValue) ;
+        else gridGathererConnector_->transfer(tmpArrayOut, dataOut, op) ;
       }