Changeset 2291 for XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_gatherer_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_gatherer_connector.hpp (modified) (4 diffs)

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

@@ -10 +10 @@
 #include "context_client.hpp"
 #include "gatherer_connector.hpp"
+#include "reduction_types.hpp"
 
 
@@ -30 +31 @@
 
       template<typename T> 
-      void transfer(const map<int, CArray<T,1>>& input, CArray<T,1>& output)
+      void transfer(const map<int, CArray<T,1>>& input, CArray<T,1>& output, EReduction op = EReduction::none)
       {
         int n = elementsConnector_.size()-1 ;
-       shared_ptr<CGathererConnector>* connector = elementsConnector_.data() + n ;
+        shared_ptr<CGathererConnector>* connector = elementsConnector_.data() + n ;
         output.resize(dstSize_) ;
-        for(auto& rankDataIn : input) 
+       
+        if (op == EReduction::none)
+          for(auto& rankDataIn : input) 
+            elementsConnector_[n]->transfer(rankDataIn.first, connector, n, rankDataIn.second.dataFirst(), output.dataFirst()) ;
+        else
         {
-          elementsConnector_[n]->transfer(rankDataIn.first, connector, n, rankDataIn.second.dataFirst(), output.dataFirst()) ;
+          T defaultValue = std::numeric_limits<T>::quiet_NaN();
+          vector<int> count(dstSize_,0) ;
+          for(auto& rankDataIn : input) 
+            elementsConnector_[n]->transfer(rankDataIn.first, connector, n, rankDataIn.second.dataFirst(), output.dataFirst(), op, count.data()) ;
+
+          for(int i=0;i<dstSize_;i++) if (count[i]==0) output(i)=defaultValue ;
         }
       } 
@@ -55 +65 @@
 
       template<typename T>
-      void transfer(CEventServer& event, CArray<T,1>& dataOut)
+      void transfer(CEventServer& event, CArray<T,1>& dataOut, EReduction op = EReduction::none)
       {
         map<int, CArray<T,1>> dataIn ;
@@ -63 +73 @@
           (*subEvent.buffer) >> data ;
         }
-        transfer(dataIn, dataOut) ;
+        transfer(dataIn, dataOut, op) ;
       }