Changeset 1958

Timestamp:

10/08/20 13:14:05 (4 years ago)

Author:

ymipsl

Message:

Xios coupling

• fix problem when sending grid mask from client to server

• remove methods about grid compression, which will be managed in other ways

=> miss some files in previous commit

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Files:

• scalar.cpp (modified) (5 diffs)
• scalar.hpp (modified) (1 diff)

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

@@ -303 +303 @@
   }
  
-  void CScalar::distributeToServer(CContextClient* client, std::map<int, CArray<size_t,1>>& globalIndex,  const string& scalarId)
-  {
-   
+  void CScalar::distributeToServer(CContextClient* client, std::map<int, CArray<size_t,1>>& globalIndex, 
+                                   CScattererConnector* &scattererConnector, const string& scalarId)
+  {
     string serverScalarId = scalarId.empty() ? this->getId() : scalarId ;
     CContext* context = CContext::getCurrent();
@@ -313 +313 @@
     CDistributedElement scatteredElement(1,globalIndex) ;
     scatteredElement.addFullView() ;
-    CScattererConnector scattererConnector(localElement_->getView(CElementView::FULL), scatteredElement.getView(CElementView::FULL), 
-                                           context->getIntraComm(), client->getRemoteSize()) ;
-    scattererConnector.computeConnector() ;
+    scattererConnector = new CScattererConnector(localElement_->getView(CElementView::FULL), scatteredElement.getView(CElementView::FULL), 
+                                                 context->getIntraComm(), client->getRemoteSize()) ;
+    scattererConnector->computeConnector() ;
     
     // phase 0
@@ -329 +329 @@
     CMessage message1 ;
     message1<<serverScalarId<<1<<localElement_->getView(CElementView::FULL)->getGlobalSize() ; 
-    scattererConnector.transfer(localElement_->getView(CElementView::FULL)->getGlobalIndex(),client,event1,message1) ;
-
-    sendDistributedAttributes(client, scattererConnector, scalarId) ;
+    scattererConnector->transfer(localElement_->getView(CElementView::FULL)->getGlobalIndex(),client,event1,message1) ;
+
+    sendDistributedAttributes(client, *scattererConnector, scalarId) ;
   
     // phase 2 send the mask : data index + mask2D
@@ -344 +344 @@
     map<int,CArray<size_t,1>> workflowGlobalIndex ;
     map<int,CArray<bool,1>> maskOut2 ; 
-    scattererConnector.transfer(maskOut, maskOut2) ;
+    scattererConnector->transfer(maskOut, maskOut2) ;
     scatteredElement.addView(CElementView::WORKFLOW, maskOut2) ;
     scatteredElement.getView(CElementView::WORKFLOW)->getGlobalIndexView(workflowGlobalIndex) ;
@@ -396 +396 @@
     else if (phasis==2)
     {
-      delete gathererConnector_ ;
+//      delete gathererConnector_ ;
       elementFrom_ = new  CDistributedElement(event) ;
       elementFrom_->addFullView() ;
-      gathererConnector_ =  new CGathererConnector(elementFrom_->getView(CElementView::FULL), localElement_->getView(CElementView::FULL)) ;
-      gathererConnector_ -> computeConnector() ;
+//      gathererConnector_ =  new CGathererConnector(elementFrom_->getView(CElementView::FULL), localElement_->getView(CElementView::FULL)) ;
+//      gathererConnector_ -> computeConnector() ;
     }
   }

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

@@ -175 +175 @@
        public:
          void computeRemoteElement(CContextClient* client, EDistributionType) ;
-         void distributeToServer(CContextClient* client, std::map<int, CArray<size_t,1>>& globalIndex, const string& scalarId="") ;
+         void distributeToServer(CContextClient* client, std::map<int, CArray<size_t,1>>& globalIndex, CScattererConnector* &scattererConnector,
+                                 const string& scalarId="") ;
+
          static void recvScalarDistribution(CEventServer& event) ;
          void receivedScalarDistribution(CEventServer& event, int phasis) ;