Changeset 1943 for XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution

Timestamp:

09/25/20 16:09:35 (4 years ago)

Author:

ymipsl

Message:

Solve issues for grid mask on server side.

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution

Files:

• grid_gatherer_connector.hpp (modified) (2 diffs)
• grid_mask_connector.cpp (added)
• grid_mask_connector.hpp (added)
• scatterer_connector.cpp (modified) (1 diff)
• scatterer_connector.hpp (modified) (2 diffs)

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

@@ -41 +41 @@
       } 
 
+      template<typename T> 
+      void transfer(const map<int, CArray<T,1>>& input, CArray<T,1>& output, T missingValue)
+      {
+        int n = elementsConnector_.size()-1 ;
+        CGathererConnector** connector = elementsConnector_.data() + n ;
+        output.resize(dstSize_) ;
+        output = missingValue ;
+        for(auto& rankDataIn : input) 
+        {
+          elementsConnector_[n]->transfer(rankDataIn.first, connector, n, rankDataIn.second.dataFirst(), output.dataFirst()) ;
+        }
+      } 
+
       template<typename T>
       void transfer(CEventServer& event, CArray<T,1>& dataOut)
@@ -52 +65 @@
         transfer(dataIn, dataOut) ;
       }
-  
+ 
+      template<typename T>
+      void transfer(CEventServer& event, CArray<T,1>& dataOut, T missingValue)
+      {
+        map<int, CArray<T,1>> dataIn ;
+        for (auto& subEvent : event.subEvents) 
+        {
+          auto& data = dataIn[subEvent.rank]; 
+          (*subEvent.buffer) >> data ;
+        }
+        transfer(dataIn, dataOut, missingValue) ;
+      }
+
   };
 }

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

@@ -51 +51 @@
 
    // compute the number of senders for a remote destination view
-    int commSize ;
-    MPI_Comm_size(localComm_, &commSize) ;
-    vector<int> ranks(commSize,0) ;
+    vector<int> ranks(remoteCommSize_,0) ;
     for(auto& rank : connector_) ranks[rank.first] = 1 ;
-    MPI_Allreduce(MPI_IN_PLACE,ranks.data(),commSize,MPI_INT,MPI_SUM,localComm_) ;
+    MPI_Allreduce(MPI_IN_PLACE,ranks.data(),remoteCommSize_,MPI_INT,MPI_SUM,localComm_) ;
     for(auto& rank : connector_) nbSenders_[rank.first] = ranks[rank.first] ;
 

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

@@ -21 +21 @@
       map<int, vector<bool>> mask_ ;  // mask is on dst view
       MPI_Comm localComm_ ;
+      int remoteCommSize_ ;
 
       CLocalView* srcView_ ;
@@ -30 +31 @@
     public:
 
-    CScattererConnector(CLocalView* srcView, CDistributedView* dstView, MPI_Comm localComm) 
-                       : srcView_(srcView), dstView_(dstView), localComm_(localComm) {}
+    CScattererConnector(CLocalView* srcView, CDistributedView* dstView, MPI_Comm localComm, int remoteCommSize) 
+                       : srcView_(srcView), dstView_(dstView), localComm_(localComm), remoteCommSize_(remoteCommSize) {}
     void computeConnector(void) ;