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

Timestamp:

03/07/22 16:41:48 (2 years ago)

Author:

ymipsl

Message:

Fix problem in remote connector for read variable : supress redondance optimisation on remote connector in read case.
YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution

Files:

• grid_client_server_remote_connector.cpp (modified) (1 diff)
• grid_client_server_remote_connector.hpp (modified) (1 diff)

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

@@ -16 +16 @@
 
 
-  void CGridClientServerRemoteConnector::computeConnector(void)
+  void CGridClientServerRemoteConnector::computeConnector(bool eliminateRedondant)
   {
-    auto workflowRemoteConnector=make_shared<CGridRemoteConnector>(srcWorkflowView_,dstView_,localComm_,remoteSize_) ;
-    workflowRemoteConnector->computeConnector() ;
-    computeViewDistribution() ;
+    if (eliminateRedondant)
+    {
+      auto workflowRemoteConnector=make_shared<CGridRemoteConnector>(srcWorkflowView_,dstView_,localComm_,remoteSize_) ;
+      workflowRemoteConnector->computeConnector() ;
+      computeViewDistribution() ;
     
-    for(int i=0;i<srcView_.size();i++) isSrcViewDistributed_[i] =  isSrcViewDistributed_[i] || workflowRemoteConnector->getIsSrcViewDistributed()[i]  ;
-    computeConnectorMethods() ;
-    computeRedondantRanks() ;
+      for(int i=0;i<srcView_.size();i++) isSrcViewDistributed_[i] =  isSrcViewDistributed_[i] || workflowRemoteConnector->getIsSrcViewDistributed()[i]  ;
+      computeConnectorMethods() ;
+      computeRedondantRanks() ;
 
-    for(auto& rank : rankToRemove_)
-      if (workflowRemoteConnector->getRankToRemove().count(rank)!=0)
-        for(auto& element : elements_) element.erase(rank) ;
+      for(auto& rank : rankToRemove_)
+        if (workflowRemoteConnector->getRankToRemove().count(rank)!=0)
+          for(auto& element : elements_) element.erase(rank) ;
+    }
+    else 
+    {
+      computeViewDistribution() ;
+      computeConnectorRedundant() ;
+    }
   }
 

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

@@ -13 +13 @@
 
       CGridClientServerRemoteConnector(vector<shared_ptr<CLocalView>>& srcView, vector<shared_ptr<CLocalView>>& worflowSrcView, vector<shared_ptr<CDistributedView>>& dstView, MPI_Comm localComm, int remoteSize) ;
-      void computeConnector(void) ;
+      void computeConnector(bool eliminateRedondant=true) ;
       vector<shared_ptr<CLocalView>> srcWorkflowView_ ;   
   } ;