Changeset 1943 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.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/grid.cpp (modified) (10 diffs)

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

@@ -23 +23 @@
 #include "grid_elements.hpp"
 #include "grid_local_view.hpp"
+#include "grid_mask_connector.hpp"
 
 
@@ -275 +276 @@
   TRY
   {
+    setDomainList();
     std::vector<CDomain*> domList;
     if (!domList_.empty())
@@ -291 +293 @@
   TRY
   {
+    setAxisList();
     std::vector<CAxis*> aList;
     if (!axisList_.empty())
@@ -306 +309 @@
   TRY
   {
+    setScalarList() ;
     std::vector<CScalar*> sList;
     if (!scalarList_.empty())
@@ -2597 +2601 @@
            return true;
            break;
+
+         case EVENT_ID_SEND_MASK :
+           recvMask(event);
+           return true;
+           break;
         default :
-          ERROR("bool CDomain::dispatchEvent(CEventServer& event)",
+          ERROR("bool CGrid::dispatchEvent(CEventServer& event)",
                 << "Unknown Event");
           return false;
@@ -2671 +2680 @@
     gridRemoteConnector.computeConnector() ;
     
-    vector<CScattererConnector*> clientToServerConnectors ;
-    vector<CGathererConnector*>  clientFromServerConnectors ;
+    vector<CScattererConnector*> scattererConnectors ;
     for(int i=0 ; i<elements.size() ; i++)
     {
@@ -2680 +2688 @@
          sendAddDomain(domain->getId(),client) ;
          domain->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i)) ;
-         clientToServerConnectors.push_back(domain->getClientToServerConnector(client)) ;
-         clientFromServerConnectors.push_back(domain->getClientFromServerConnector(client)) ;
+         scattererConnectors.push_back(domain->getClientToServerConnector(client)) ;
       }
       else if (elements[i].type==TYPE_AXIS)
@@ -2688 +2695 @@
         sendAddAxis(axis->getId(),client) ;
         axis->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i)) ;
-        clientToServerConnectors.push_back(axis->getClientToServerConnector(client)) ;
-        clientFromServerConnectors.push_back(axis->getClientFromServerConnector(client)) ;
-
+        scattererConnectors.push_back(axis->getClientToServerConnector(client)) ;
       }
       else if (elements[i].type==TYPE_SCALAR)
@@ -2697 +2702 @@
         sendAddScalar(scalar->getId(),client) ;
         scalar->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i)) ;
-        clientToServerConnectors.push_back(scalar->getClientToServerConnector(client)) ;
-        clientFromServerConnectors.push_back(scalar->getClientFromServerConnector(client)) ;
+        scattererConnectors.push_back(scalar->getClientToServerConnector(client)) ;
+      }
+    }
+
+    CGridScattererConnector gridScattererConnector(scattererConnectors) ;
+    CGridLocalConnector* workflowToFull = getGridLocalElements()->getConnector(CElementView::WORKFLOW, CElementView::FULL) ;
+    CArray<bool,1> maskIn(workflowToFull->getSrcSize()) ;
+    CArray<bool,1> maskOut(workflowToFull->getDstSize()) ;
+    maskIn = true ;
+    workflowToFull->transfer(maskIn,maskOut,false) ;
+
+    CEventClient event(getType(), EVENT_ID_SEND_MASK);
+    CMessage message ;
+    message<<getId() ; 
+    gridScattererConnector.transfer(maskOut, client, event, message) ;
+
+
+    vector<CScattererConnector*> clientToServerConnectors ;
+    vector<CGathererConnector*>  clientFromServerConnectors ;
+    for(auto& element : elements)
+    {
+      if (element.type==TYPE_DOMAIN) 
+      { 
+         clientToServerConnectors.push_back(element.domain->getClientToServerConnector(client)) ;
+         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)) ;
+
+      }
+      else if (element.type==TYPE_SCALAR)
+      {
+        clientToServerConnectors.push_back(element.scalar->getClientToServerConnector(client)) ;
+        clientFromServerConnectors.push_back(element.scalar->getClientFromServerConnector(client)) ;
       }
     }
@@ -2707 +2746 @@
 
 
+  }
+
+  void CGrid::recvMask(CEventServer& event)
+  {
+    string gridId;
+    for (auto& subEvent : event.subEvents) (*subEvent.buffer) >> gridId  ;
+    get(gridId)->receiveMask(event);
+  }
+  
+  void CGrid::receiveMask(CEventServer& event)
+  {
+    vector<CGathererConnector*> gathererConnectors ;
+    vector<CLocalView*> fullViews ;
+
+    for(auto& element : getElements())
+    {
+      if (element.type==TYPE_DOMAIN) 
+      {
+        gathererConnectors.push_back(element.domain->getGathererConnector());
+        fullViews.push_back(element.domain->getLocalElement()->getView(CElementView::FULL));
+        
+      }
+      else if (element.type==TYPE_AXIS)
+      {
+       gathererConnectors.push_back(element.axis->getGathererConnector());
+       fullViews.push_back(element.axis->getLocalElement()->getView(CElementView::FULL));
+      }
+      else if (element.type==TYPE_SCALAR) 
+      {
+        gathererConnectors.push_back(element.scalar->getGathererConnector());
+        fullViews.push_back(element.scalar->getLocalElement()->getView(CElementView::FULL));
+      }
+    }
+    CGridGathererConnector gridGathererConnector(gathererConnectors) ;
+    CGridMaskConnector gridMaskConnector(fullViews) ;
+
+    CArray<bool,1> maskOut ;
+    gridGathererConnector.transfer(event,maskOut,false) ;
+    gridMaskConnector.computeConnector(maskOut) ;
+
+    CContextClient* client = event.getContextServer()->getAssociatedClient() ;
+    int i=0 ;
+    for(auto& element : getElements())
+    {
+      if (element.type==TYPE_DOMAIN) element.domain->setServerMask(gridMaskConnector.getElementMask(i),client);
+      else if (element.type==TYPE_AXIS) element.axis->setServerMask(gridMaskConnector.getElementMask(i),client);
+      else if (element.type==TYPE_SCALAR) element.scalar->setServerMask(gridMaskConnector.getElementMask(i),client);
+      i++ ;
+    }
   }