Changeset 1930 for XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/scatterer_connector.hpp

Timestamp:

09/10/20 13:51:02 (4 years ago)

Author:

ymipsl

Message:

Big update on on going work related to data distribution and transfer between clients and servers.
Revisite of the source and store filter using "connectors".

YM

File:

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

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

@@ -34 +34 @@
     void computeConnector(void) ;
     
-    template<typename T>
-    void transfer(const CArray<T,1>& dataIn, map<int, CArray<T,1>>& dataOut)
+    template<typename T, int n>
+    void transfer(const CArray<T,n>& dataIn, map<int, CArray<T,1>>& dataOut)
     {
+      transfer(1, dataIn, dataOut) ;
+    }
+
+    template<typename T, int n>
+    void transfer(const CArray<T,n>& dataIn, map<int, CArray<T,1>>& dataOut, T missingValue)
+    {
+      transfer(1, dataIn, dataOut, missingValue) ;
+    }
+
+    template<typename T, int n>
+    void transfer(int sizeT, const CArray<T,n>& dataIn, map<int, CArray<T,1>>& dataOut)
+    {
+      // for future, make a specific transfer function for sizeT=1 to avoid multiplication (increasing performance)
       for(auto& rankConnector : connector_)
       {
@@ -44 +57 @@
         int dstSize = mask.size() ;
         auto& data = dataOut[rank] ;
-        data.resize(dstSize) ;
+        data.resize(dstSize * sizeT) ;
         T* dstData = data.dataFirst() ;
         const T* srcData = dataIn.dataFirst() ;
@@ -50 +63 @@
           if (mask[i]) 
           {
-            dstData[i] = srcData[connector[j]] ;
+            for(int k=0;k<sizeT;k++) dstData[i*sizeT+k] = srcData[connector[j]*sizeT+k] ;
+            j++ ;
+          }
+      }
+    }
+
+    template<typename T, int n>
+    void transfer(int sizeT, const CArray<T,n>& dataIn, map<int, CArray<T,1>>& dataOut, T missingValue)
+    {
+      // for future, make a specific transfer function for sizeT=1 to avoid multiplication (increasing performance)
+      for(auto& rankConnector : connector_)
+      {
+        int rank = rankConnector.first ;
+        auto& connector = rankConnector.second ;
+        auto& mask = mask_[rank] ;
+        int dstSize = mask.size() ;
+        auto& data = dataOut[rank] ;
+        data.resize(dstSize * sizeT) ;
+        T* dstData = data.dataFirst() ;
+        const T* srcData = dataIn.dataFirst() ;
+        for(int i=0, j=0; i<dstSize; i++)
+          if (mask[i]) 
+          {
+            for(int k=0;k<sizeT;k++) dstData[i*sizeT+k] = srcData[connector[j]*sizeT+k] ;
+            j++ ;
+          }
+          else 
+          {
+            for(int k=0;k<sizeT;k++) dstData[i*sizeT+k] = missingValue ;
             j++ ;
           }
@@ -56 +97 @@
     }
     
-    template<typename T>
-    void transfer(const CArray<T,1>& dataIn, CContextClient* client, CEventClient& event, const CMessage& messageHeader)
+    template<typename T,int n>
+    void transfer(const CArray<T,n>& dataIn, CContextClient* client, CEventClient& event, const CMessage& messageHeader)
+    {
+      transfer(1, dataIn, client, event, messageHeader) ;
+    }
+
+    template<typename T,int n>
+    void transfer(const CArray<T,n>& dataIn, T missingValue, CContextClient* client, CEventClient& event, const CMessage& messageHeader)
+    {
+      transfer(1, dataIn, missingValue, client, event, messageHeader) ;
+    }
+
+    template<typename T, int n>
+    void transfer(int sizeT, const CArray<T,n>& dataIn, CContextClient* client, CEventClient& event, const CMessage& messageHeader)
     {
       map<int, CArray<T,1>> dataOut ;
-      transfer(dataIn, dataOut) ;
+      transfer(sizeT, dataIn, dataOut) ;
+      sendToServer(dataOut, client, event, messageHeader) ;
+    }
+
+    template<typename T, int n>
+    void transfer(int sizeT, const CArray<T,n>& dataIn, T missingValue, CContextClient* client, CEventClient& event, const CMessage& messageHeader)
+    {
+      map<int, CArray<T,1>> dataOut ;
+      transfer(sizeT, dataIn, dataOut, missingValue) ;
       sendToServer(dataOut, client, event, messageHeader) ;
     }