Changeset 2304 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/scalar.cpp

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

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/scalar.cpp (modified) (5 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/scalar.cpp

@@ -420 +420 @@
   }
  
-  void CScalar::distributeToServer(CContextClient* client, std::map<int, CArray<size_t,1>>& globalIndex, 
+  void CScalar::distributeToServer(CContextClient* client, std::map<int, CArray<size_t,1>>& globalIndexOut,  std::map<int, CArray<size_t,1>>& globalIndexIn, 
                                    shared_ptr<CScattererConnector> &scattererConnector, const string& scalarId)
   {
@@ -428 +428 @@
     this->sendAllAttributesToServer(client, serverScalarId)  ;
 
-    auto scatteredElement = make_shared<CDistributedElement>(1,globalIndex) ;
+    auto scatteredElement = make_shared<CDistributedElement>(1,globalIndexOut) ;
     scatteredElement->addFullView() ;
     scattererConnector = make_shared<CScattererConnector>(localElement_->getView(CElementView::FULL), scatteredElement->getView(CElementView::FULL), 
@@ -451 +451 @@
   
     // phase 2 send the mask : data index + mask2D
-    CArray<bool,1> maskIn(localElement_->getView(CElementView::WORKFLOW)->getSize());
-    CArray<bool,1> maskOut ;
-    auto workflowToFull = make_shared<CLocalConnector>(localElement_->getView(CElementView::WORKFLOW), localElement_->getView(CElementView::FULL)) ;
-    workflowToFull->computeConnector() ;
-    maskIn=true ;
-    workflowToFull->transfer(maskIn,maskOut,false) ;
-
-    // phase 3 : prepare grid scatterer connector to send data from client to server
-    map<int,CArray<size_t,1>> workflowGlobalIndex ;
-    map<int,CArray<bool,1>> maskOut2 ; 
-    scattererConnector->transfer(maskOut, maskOut2) ;
-    scatteredElement->addView(CElementView::WORKFLOW, maskOut2) ;
-    scatteredElement->getView(CElementView::WORKFLOW)->getGlobalIndexView(workflowGlobalIndex) ;
-    // create new workflow view for scattered element
-    auto clientToServerElement = make_shared<CDistributedElement>(scatteredElement->getGlobalSize(), workflowGlobalIndex) ;
-    clientToServerElement->addFullView() ;
-    CEventClient event2(getType(), EVENT_ID_SCALAR_DISTRIBUTION);
-    CMessage message2 ;
-    message2<<serverScalarId<<2 ; 
-    clientToServerElement->sendToServer(client, event2, message2) ; 
-    clientToServerConnector_[client] = make_shared<CScattererConnector>(localElement_->getView(CElementView::WORKFLOW), clientToServerElement->getView(CElementView::FULL),
-                                                                        context->getIntraComm(), client->getRemoteSize()) ;
-    clientToServerConnector_[client]->computeConnector() ;
-
-    clientFromServerConnector_[client] = make_shared<CGathererConnector>(clientToServerElement->getView(CElementView::FULL), localElement_->getView(CElementView::WORKFLOW));
-    clientFromServerConnector_[client]->computeConnector() ;
-
+    {
+      CArray<bool,1> maskIn(localElement_->getView(CElementView::WORKFLOW)->getSize());
+      CArray<bool,1> maskOut ;
+      auto workflowToFull = make_shared<CLocalConnector>(localElement_->getView(CElementView::WORKFLOW), localElement_->getView(CElementView::FULL)) ;
+      workflowToFull->computeConnector() ;
+      maskIn=true ;
+      workflowToFull->transfer(maskIn,maskOut,false) ;
+
+      // prepare grid scatterer connector to send data from client to server
+      map<int,CArray<size_t,1>> workflowGlobalIndex ;
+      map<int,CArray<bool,1>> maskOut2 ; 
+      scattererConnector->transfer(maskOut, maskOut2) ;
+      scatteredElement->addView(CElementView::WORKFLOW, maskOut2) ;
+      scatteredElement->getView(CElementView::WORKFLOW)->getGlobalIndexView(workflowGlobalIndex) ;
+      // create new workflow view for scattered element
+      auto clientToServerElement = make_shared<CDistributedElement>(scatteredElement->getGlobalSize(), workflowGlobalIndex) ;
+      clientToServerElement->addFullView() ;
+      CEventClient event2(getType(), EVENT_ID_SCALAR_DISTRIBUTION);
+      CMessage message2 ;
+      message2<<serverScalarId<<2 ; 
+      clientToServerElement->sendToServer(client, event2, message2) ; 
+      clientToServerConnector_[client] = make_shared<CScattererConnector>(localElement_->getView(CElementView::WORKFLOW), clientToServerElement->getView(CElementView::FULL),
+                                                                          context->getIntraComm(), client->getRemoteSize()) ;
+      clientToServerConnector_[client]->computeConnector() ;
+    }
+
+    ////////////
+    // phase 3 : compute connector to receive from server
+    ////////////
+    {
+      auto scatteredElement = make_shared<CDistributedElement>(1, globalIndexIn) ;
+      scatteredElement->addFullView() ;
+      auto scattererConnector = make_shared<CScattererConnector>(localElement_->getView(CElementView::FULL), scatteredElement->getView(CElementView::FULL), 
+                                                                 context->getIntraComm(), client->getRemoteSize()) ;
+      scattererConnector->computeConnector() ;
+ 
+      CArray<bool,1> maskIn(localElement_->getView(CElementView::WORKFLOW)->getSize());
+      CArray<bool,1> maskOut ;
+      auto workflowToFull = make_shared<CLocalConnector>(localElement_->getView(CElementView::WORKFLOW), localElement_->getView(CElementView::FULL)) ;
+      workflowToFull->computeConnector() ;
+      maskIn=true ;
+      workflowToFull->transfer(maskIn,maskOut,false) ;
+
+      map<int,CArray<size_t,1>> workflowGlobalIndex ;
+      map<int,CArray<bool,1>> maskOut2 ; 
+      scattererConnector->transfer(maskOut, maskOut2, false) ;
+      scatteredElement->addView(CElementView::WORKFLOW, maskOut2) ;
+      scatteredElement->getView(CElementView::WORKFLOW)->getGlobalIndexView(workflowGlobalIndex) ;
+      auto clientToServerElement = make_shared<CDistributedElement>(scatteredElement->getGlobalSize(), workflowGlobalIndex) ;
+      clientToServerElement->addFullView() ;
+      CEventClient event3(getType(), EVENT_ID_SCALAR_DISTRIBUTION);
+      CMessage message3 ;
+      message3<<serverScalarId<<3 ; 
+      clientToServerElement->sendToServer(client, event3, message3) ; 
+
+      clientFromServerConnector_[client] = make_shared<CGathererConnector>(clientToServerElement->getView(CElementView::FULL), localElement_->getView(CElementView::WORKFLOW));
+      clientFromServerConnector_[client]->computeConnector() ;      
+    }
   }
   
@@ -518 +549 @@
 //      gathererConnector_ =  make_shared<CGathererConnector>(elementFrom_->getView(CElementView::FULL), localElement_->getView(CElementView::FULL)) ;
 //      gathererConnector_ -> computeConnector() ;
+    }
+    else if (phasis==3)
+    {
+      elementTo_ = make_shared<CDistributedElement>(event) ;
+      elementTo_->addFullView() ;
     }
   }
@@ -532 +568 @@
     serverFromClientConnector_->computeConnector() ;
       
-    serverToClientConnector_ = make_shared<CScattererConnector>(localElement_->getView(CElementView::WORKFLOW), elementFrom_->getView(CElementView::FULL),
+    serverToClientConnector_ = make_shared<CScattererConnector>(localElement_->getView(CElementView::WORKFLOW), elementTo_->getView(CElementView::FULL),
                                                                 context->getIntraComm(), client->getRemoteSize()) ;
     serverToClientConnector_->computeConnector() ;