Changeset 1943 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp

Timestamp:

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

Author:

ymipsl

Message:

Solve issues for grid mask on server side.

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp (modified) (4 diffs)

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

@@ -2305 +2305 @@
     CDistributedElement scatteredElement(ni_glo*nj_glo, globalIndex) ;
     scatteredElement.addFullView() ;
-    CScattererConnector scattererConnector(localElement_->getView(CElementView::FULL), scatteredElement.getView(CElementView::FULL), context->getIntraComm()) ;
+    CScattererConnector scattererConnector(localElement_->getView(CElementView::FULL), scatteredElement.getView(CElementView::FULL), 
+                                           context->getIntraComm(), client->getRemoteSize()) ;
     scattererConnector.computeConnector() ;
 
@@ -2347 +2348 @@
     message2<<serverDomainId<<2 ; 
     clientToServerElement.sendToServer(client, event2, message2) ; 
-    clientToServerConnector_[client] = new CScattererConnector(localElement_->getView(CElementView::WORKFLOW),
-                                                              clientToServerElement.getView(CElementView::FULL), context->getIntraComm()) ;
+    clientToServerConnector_[client] = new CScattererConnector(localElement_->getView(CElementView::WORKFLOW), clientToServerElement.getView(CElementView::FULL),
+                                                               context->getIntraComm(), client->getRemoteSize()) ;
     clientToServerConnector_[client]->computeConnector() ;
 
-
-    CEventClient event3(getType(), EVENT_ID_DOMAIN_DISTRIBUTION);
-    CMessage message3 ;
-    message3<<serverDomainId<<3 ; 
-    clientToServerConnector_[client]->transfer(maskIn,client,event3,message3) ; 
-    
     clientFromServerConnector_[client] = new CGathererConnector(clientToServerElement.getView(CElementView::FULL), localElement_->getView(CElementView::WORKFLOW));
     clientFromServerConnector_[client]->computeConnector() ;
@@ -2418 +2413 @@
       gathererConnector_ -> computeConnector() ;
     }
-    else if (phasis==3)
-    {
-      CArray<bool,1> localMask ;
-      gathererConnector_->transfer(event,localMask,false) ;
-      localElement_->addView(CElementView::WORKFLOW, localMask) ;
-      mask_1d.reference(localMask.copy()) ;
+  }
+  CATCH
+
+  void CDomain::setServerMask(CArray<bool,1>& serverMask, CContextClient* client)
+  TRY
+  {
+    // nota : the client is needed to get the remote size for the scatterer connector. Maybe it is not the good place for this
+    // Later, server to client connector can be computed on demand, with "client" as argument
+    CContext* context = CContext::getCurrent();
+    localElement_->addView(CElementView::WORKFLOW, serverMask) ;
+    mask_1d.reference(serverMask.copy()) ;
  
-      serverFromClientConnector_ = new CGathererConnector(elementFrom_->getView(CElementView::FULL), localElement_->getView(CElementView::WORKFLOW)) ;
-      serverFromClientConnector_->computeConnector() ;
+    serverFromClientConnector_ = new CGathererConnector(elementFrom_->getView(CElementView::FULL), localElement_->getView(CElementView::WORKFLOW)) ;
+    serverFromClientConnector_->computeConnector() ;
       
-      serverToClientConnector_ = new CScattererConnector(localElement_->getView(CElementView::WORKFLOW), elementFrom_->getView(CElementView::FULL),
-                                                         context->getIntraComm()) ;
-      serverToClientConnector_->computeConnector() ;
- 
-    }
-  }
-  CATCH
+    serverToClientConnector_ = new CScattererConnector(localElement_->getView(CElementView::WORKFLOW), elementFrom_->getView(CElementView::FULL),
+                                                       context->getIntraComm(), client->getRemoteSize()) ;
+    serverToClientConnector_->computeConnector() ;
+  }
+  CATCH_DUMP_ATTR
 
 
@@ -2579 +2577 @@
     CDistributedElement scatteredElement(remoteElement.getGlobalSize(), remoteConnector.getDistributedGlobalIndex()) ;
     scatteredElement.addFullView() ;
-    CScattererConnector scatterConnector(localElement_->getView(CElementView::FULL), scatteredElement.getView(CElementView::FULL), context->getIntraComm()) ;
+    CScattererConnector scatterConnector(localElement_->getView(CElementView::FULL), scatteredElement.getView(CElementView::FULL), 
+                                         context->getIntraComm(), client->getRemoteSize()) ;
     scatterConnector.computeConnector() ;
     CGridScattererConnector gridScatter({&scatterConnector}) ;