Changeset 2137 for XIOS/dev/dev_trunk_graph/src/distribution

Timestamp:

05/30/21 23:30:01 (3 years ago)

Author:

yushan

Message:

temporal commit for merging graph into XIOS_coupling

Location:

XIOS/dev/dev_trunk_graph/src/distribution

Files:

• gatherer_connector.hpp (modified) (1 diff)
• grid_scatterer_connector.hpp (modified) (1 diff)
• grid_transform_connector.cpp (modified) (1 diff)
• scatterer_connector.hpp (modified) (1 diff)

XIOS/dev/dev_trunk_graph/src/distribution/gatherer_connector.hpp

@@ -151 +151 @@
       void transfer(map<int, CArray<T,1>>& dataIn, CArray<T,1>& dataOut, T missingValue)
       {
-        transfer(1, 1, dataIn, dataout, missingValue)
+        transfer(1, 1, dataIn, dataOut, missingValue);
       }
       

XIOS/dev/dev_trunk_graph/src/distribution/grid_scatterer_connector.hpp

@@ -42 +42 @@
       }     
 
-
+      const map<int,int>& getTransferedDataSize(void) {return dstSize_;}
+     
       template<typename T, int N> 
       void transfer(const CArray<T,N>& input, map<int, CArray<T,1>>& output)

XIOS/dev/dev_trunk_graph/src/distribution/grid_transform_connector.cpp

@@ -59 +59 @@
         vector<size_t> recvBuff(size) ;
         MPI_Recv(recvBuff.data(), size, MPI_SIZE_T, status.MPI_SOURCE,0, localComm_,&status) ;
-        if(size)
-        {
-          CArray<size_t,1> arrayTmp(recvBuff.data(), shape(recvBuff.size()), duplicateData) ;
-          recvIndex[status.MPI_SOURCE].reference(arrayTmp) ;
-        }
+        CArray<size_t,1> arrayTmp(recvBuff.data(), shape(recvBuff.size()), duplicateData) ;
+        recvIndex[status.MPI_SOURCE].reference(arrayTmp) ;
         if (recvRankSize_.count(status.MPI_SOURCE)==0) recvRankSize_[status.MPI_SOURCE] = size ; 
         else recvRankSize_[status.MPI_SOURCE] *= size ; 

XIOS/dev/dev_trunk_graph/src/distribution/scatterer_connector.hpp

@@ -50 +50 @@
     void transfer(int sizeT, const CArray<T,n>& dataIn, map<int, CArray<T,1>>& dataOut)
     {
-      transfer(1, sizeT, dataIn, dataOut)
+      transfer(1, sizeT, dataIn, dataOut);
     }