Changeset 1956 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

Timestamp:

10/08/20 13:10:29 (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

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp (modified) (7 diffs)

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

@@ -2681 +2681 @@
     
     vector<CScattererConnector*> scattererConnectors ;
+    CScattererConnector* scattererConnector;
     for(int i=0 ; i<elements.size() ; i++)
     {
@@ -2687 +2688 @@
          CDomain* domain = (CDomain*) elements[i].ptr ;
          sendAddDomain(domain->getId(),client) ;
-         domain->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i)) ;
-         scattererConnectors.push_back(domain->getClientToServerConnector(client)) ;
+         domain->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i), scattererConnector) ;
+         scattererConnectors.push_back(scattererConnector) ;
       }
       else if (elements[i].type==TYPE_AXIS)
@@ -2694 +2695 @@
         CAxis* axis = (CAxis*) elements[i].ptr ;
         sendAddAxis(axis->getId(),client) ;
-        axis->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i)) ;
-        scattererConnectors.push_back(axis->getClientToServerConnector(client)) ;
+        axis->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i), scattererConnector) ;
+        scattererConnectors.push_back(scattererConnector) ;
       }
       else if (elements[i].type==TYPE_SCALAR)
@@ -2701 +2702 @@
         CScalar* scalar = (CScalar*) elements[i].ptr ;
         sendAddScalar(scalar->getId(),client) ;
-        scalar->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i)) ;
-        scattererConnectors.push_back(scalar->getClientToServerConnector(client)) ;
+        scalar->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i), scattererConnector) ;
+        scattererConnectors.push_back(scattererConnector) ;
       }
     }
@@ -2717 +2718 @@
     message<<getId() ; 
     gridScattererConnector.transfer(maskOut, client, event, message) ;
-
+    for(auto& it : scattererConnectors) delete it ;
 
     vector<CScattererConnector*> clientToServerConnectors ;
@@ -2800 +2801 @@
   void CGrid::sendGridToCouplerOut(CContextClient* client, const string& fieldId)
   {
-    if (sendGridToCouplerOut_done_.count(client)!=0) return ;
+/*    if (sendGridToCouplerOut_done_.count(client)!=0) return ;
     else sendGridToCouplerOut_done_.insert(client) ;
  
@@ -2872 +2873 @@
     
     // compute the grid clientToServerConnector to send flux from client to servers
-    clientToClientConnector_[client] = new CGridScattererConnector(clientToClientConnectors) ;
+    clientToClientConnector_[client] = new CGridScattererConnector(clientToClientConnectors) ;*/
   }