Changeset 2397 for XIOS3/trunk/src/node/grid.cpp

Timestamp:

08/31/22 17:23:56 (22 months ago)

Author:

ymipsl

Message:

• Optimize remote connector computation in case of read (reverse way).
• don't compute anymore clientFromServerConnector (and all intermediate computation) for non reading case.

YM

File:

• XIOS3/trunk/src/node/grid.cpp (modified) (10 diffs)

XIOS3/trunk/src/node/grid.cpp

@@ -1448 +1448 @@
  
 
-  void CGrid::sendGridToFileServer(CContextClient* client)
+  void CGrid::sendGridToFileServer(CContextClient* client, bool inOut)
   {
     if (sendGridToFileServer_done_.count(client)!=0) return ;
@@ -1457 +1457 @@
     gridPtr->sendCreateChild(this->getId(),client);
     this->sendAllAttributesToServer(client);
-    distributeGridToServer(client) ;
+    distributeGridToServer(client, inOut) ;
   }
 
@@ -1466 +1466 @@
     else sendGridToCouplerOut_done_.insert(client) ;
     this->sendAllAttributesToServer(client, getCouplingAlias(fieldId));
-    distributeGridToServer(client, fieldId) ;
-  }
-
-
-  void CGrid::distributeGridToServer(CContextClient* client, const string& fieldId)
+    distributeGridToServer(client, false, fieldId) ;
+  }
+
+
+  void CGrid::distributeGridToServer(CContextClient* client, bool inOut, const string& fieldId)
   {
     CContext* context = CContext::getCurrent();
@@ -1520 +1520 @@
     // CGridClientServerRemoteConnector : workflowView is added to avoid spurious optimisation with only the fullview
     auto gridRemoteConnector = make_shared<CGridClientServerRemoteConnector>(localViews, workflowView, remoteViews, context->getIntraComm(), client->getRemoteSize()) ;
-    gridRemoteConnector->computeConnector(true) ;
+    gridRemoteConnector->computeConnectorOut() ;
     
-    auto gridRemoteConnectorIn = make_shared<CGridClientServerRemoteConnector>(localViews, workflowView, remoteViews, context->getIntraComm(), client->getRemoteSize()) ;
-    gridRemoteConnectorIn->computeConnector(false) ;
-
-    
+    shared_ptr<CGridClientServerRemoteConnector> gridRemoteConnectorIn ;
+    if (inOut)
+    {
+      gridRemoteConnectorIn = make_shared<CGridClientServerRemoteConnector>(localViews, workflowView, remoteViews, context->getIntraComm(), client->getRemoteSize()) ;
+      gridRemoteConnectorIn->computeConnectorIn() ;
+    }
+    else gridRemoteConnectorIn = gridRemoteConnector ;
+
+
     vector<shared_ptr<CScattererConnector>> scattererConnectors ;
     shared_ptr<CScattererConnector> scattererConnector;
@@ -1533 +1538 @@
       { 
         CDomain* domain = (CDomain*) elements[i].ptr ;
-        if (isCoupling) domain->distributeToServer(client, gridRemoteConnector->getDistributedGlobalIndex(i), gridRemoteConnectorIn->getDistributedGlobalIndex(i),
+        if (isCoupling) domain->distributeToServer(client, inOut, gridRemoteConnector->getDistributedGlobalIndex(i), gridRemoteConnectorIn->getDistributedGlobalIndex(i),
                                                    scattererConnector,  domain->getCouplingAlias(fieldId,i)) ;
         else 
         {
           sendAddDomain(domain->getId(),client) ;
-          domain->distributeToServer(client, gridRemoteConnector->getDistributedGlobalIndex(i), gridRemoteConnectorIn->getDistributedGlobalIndex(i), scattererConnector) ;
+          domain->distributeToServer(client, inOut, gridRemoteConnector->getDistributedGlobalIndex(i), gridRemoteConnectorIn->getDistributedGlobalIndex(i), scattererConnector) ;
         }
         scattererConnectors.push_back(scattererConnector) ;
@@ -1545 +1550 @@
       {
         CAxis* axis = (CAxis*) elements[i].ptr ;
-        if (isCoupling) axis->distributeToServer(client, gridRemoteConnector->getDistributedGlobalIndex(i), gridRemoteConnectorIn->getDistributedGlobalIndex(i),
+        if (isCoupling) axis->distributeToServer(client, inOut, gridRemoteConnector->getDistributedGlobalIndex(i), gridRemoteConnectorIn->getDistributedGlobalIndex(i),
                                                  scattererConnector,  axis->getCouplingAlias(fieldId,i)) ;
         else 
         {
           sendAddAxis(axis->getId(),client) ;
-          axis->distributeToServer(client, gridRemoteConnector->getDistributedGlobalIndex(i), gridRemoteConnectorIn->getDistributedGlobalIndex(i), scattererConnector) ;
+          axis->distributeToServer(client, inOut, gridRemoteConnector->getDistributedGlobalIndex(i), gridRemoteConnectorIn->getDistributedGlobalIndex(i), scattererConnector) ;
         }
         scattererConnectors.push_back(scattererConnector) ;
@@ -1557 +1562 @@
       {
         CScalar* scalar = (CScalar*) elements[i].ptr ;
-        if (isCoupling) scalar->distributeToServer(client, gridRemoteConnector->getDistributedGlobalIndex(i), gridRemoteConnectorIn->getDistributedGlobalIndex(i),
+        if (isCoupling) scalar->distributeToServer(client, inOut, gridRemoteConnector->getDistributedGlobalIndex(i), gridRemoteConnectorIn->getDistributedGlobalIndex(i),
                                                    scattererConnector,  scalar->getCouplingAlias(fieldId,i)) ;
         else 
         {
           sendAddScalar(scalar->getId(),client) ;
-          scalar->distributeToServer(client, gridRemoteConnector->getDistributedGlobalIndex(i), gridRemoteConnectorIn->getDistributedGlobalIndex(i), scattererConnector) ;
+          scalar->distributeToServer(client, inOut, gridRemoteConnector->getDistributedGlobalIndex(i), gridRemoteConnectorIn->getDistributedGlobalIndex(i), scattererConnector) ;
         }
         scattererConnectors.push_back(scattererConnector) ;
@@ -1588 +1593 @@
       { 
          clientToServerConnectors.push_back(element.domain->getClientToServerConnector(client)) ;
-         clientFromServerConnectors.push_back(element.domain->getClientFromServerConnector(client)) ;
+         if (inOut) clientFromServerConnectors.push_back(element.domain->getClientFromServerConnector(client)) ;
       }
       else if (element.type==TYPE_AXIS)
       {
         clientToServerConnectors.push_back(element.axis->getClientToServerConnector(client)) ;
-        clientFromServerConnectors.push_back(element.axis->getClientFromServerConnector(client)) ;
+        if (inOut) clientFromServerConnectors.push_back(element.axis->getClientFromServerConnector(client)) ;
 
       }
@@ -1599 +1604 @@
       {
         clientToServerConnectors.push_back(element.scalar->getClientToServerConnector(client)) ;
-        clientFromServerConnectors.push_back(element.scalar->getClientFromServerConnector(client)) ;
+        if (inOut) clientFromServerConnectors.push_back(element.scalar->getClientFromServerConnector(client)) ;
       }
     }
@@ -1605 +1610 @@
     // compute the grid clientToServerConnector to send flux from client to servers
     clientToServerConnector_[client] = make_shared<CGridScattererConnector>(clientToServerConnectors) ;
-    clientFromServerConnector_[client] = make_shared<CGridGathererConnector>(clientFromServerConnectors) ;
+    if (inOut) clientFromServerConnector_[client] = make_shared<CGridGathererConnector>(clientFromServerConnectors) ;
 
   }