Changeset 2236 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Timestamp:

09/20/21 18:18:17 (3 years ago)

Author:

ymipsl

Message:

Fix problem in remoteConnector when computing grid to sent to server.
Some optimisations when grid is not distributed need knowledge of the workflow view.
New CGridClientServerConnector class created based on CGridRemoteConnector.

YM

File:

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

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

@@ -18 +18 @@
 #include "server.hpp"
 #include "distribution_type.hpp"
-#include "grid_remote_connector.hpp"
+#include "grid_client_server_remote_connector.hpp"
 #include "grid_elements.hpp"
 #include "grid_local_view.hpp"
@@ -1429 +1429 @@
     
     vector<CLocalView*> localViews ;
+    vector<CLocalView*> workflowView ;
     vector<CDistributedView*> remoteViews ;
 
@@ -1439 +1440 @@
          remoteViews.push_back(domain->getRemoteElement(client)->getView(CElementView::FULL)) ;
          localViews.push_back(domain->getLocalView(CElementView::FULL)) ;
+         workflowView.push_back(domain->getLocalView(CElementView::WORKFLOW)) ;
       }
       else if (elements[i].type==TYPE_AXIS)
@@ -1446 +1448 @@
         remoteViews.push_back(axis->getRemoteElement(client)->getView(CElementView::FULL)) ;
         localViews.push_back(axis->getLocalView(CElementView::FULL)) ;
+        workflowView.push_back(axis->getLocalView(CElementView::WORKFLOW)) ;
       }
       else if (elements[i].type==TYPE_SCALAR)
@@ -1453 +1456 @@
         remoteViews.push_back(scalar->getRemoteElement(client)->getView(CElementView::FULL)) ;
         localViews.push_back(scalar->getLocalView(CElementView::FULL)) ;
-      }
-    }
-    CGridRemoteConnector gridRemoteConnector(localViews, remoteViews, context->getIntraComm(), client->getRemoteSize()) ;
+        workflowView.push_back(scalar->getLocalView(CElementView::WORKFLOW)) ;
+      }
+    }
+    
+    // CGridClientServerRemoteConnector : workflowView is added to avoid spurious optimisation with only the fullview
+    CGridClientServerRemoteConnector gridRemoteConnector(localViews, workflowView, remoteViews, context->getIntraComm(), client->getRemoteSize()) ;
     gridRemoteConnector.computeConnector() ;