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

Timestamp:

11/23/21 13:12:46 (3 years ago)

Author:

ymipsl

Message:

Scalar can be now distributed on server side, avoiding incorrect result coming from redondant nature of scalar grid.
YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Files:

• field.cpp (modified) (1 diff)
• grid.cpp (modified) (2 diffs)
• scalar.cpp (modified) (6 diffs)

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

@@ -100 +100 @@
       {
         case EVENT_ID_UPDATE_DATA :
+          // return true; // temporary
           recvUpdateData(event);
           return true;

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

@@ -1427 +1427 @@
       else if (element.type==TYPE_SCALAR) posDistributed++ ;
     }
+    if (posDistributed==elements.size()) posDistributed=0 ; // grid composed only of scalar
     
     vector<CLocalView*> localViews ;
@@ -1453 +1454 @@
       {
         CScalar* scalar = (CScalar*) elements[i].ptr ;
-        scalar->computeRemoteElement(client, posDistributed==i ? EDistributionType::BANDS : EDistributionType::NONE) ;
+        scalar->computeRemoteElement(client, posDistributed==i ? EDistributionType::ROOT : EDistributionType::NONE) ;
         remoteViews.push_back(scalar->getRemoteElement(client)->getView(CElementView::FULL)) ;
         localViews.push_back(scalar->getLocalView(CElementView::FULL)) ;

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

@@ -112 +112 @@
     if (checkAttributes_done_) return ;
     checkAttributes_done_ = true ; 
-
+    
+    if (n.isEmpty()) n=1 ;
     if (mask.isEmpty()) mask=true ;
 
@@ -342 +343 @@
       int rank = CContext::getCurrent()->getIntraCommRank() ;
       
-      CArray<size_t,1> ind(1) ;
-      ind(0)=0 ;
-      localElement_ = new CLocalElement(rank, 1, ind) ;
+      
+      CArray<size_t,1> index(n) ;
+      if (n==1) index(0)=0 ;
+      localElement_ = new CLocalElement(rank, 1, index) ;
    }
 
    void CScalar::addFullView(void)
    {
-      CArray<int,1> index(1) ;
-      for(int i=0; i<1 ; i++) index(0)=0 ;
+      CArray<int,1> index(n) ;
+      if (n==1) index(0)=0 ;
       localElement_ -> addView(CElementView::FULL, index) ;
    }
@@ -357 +359 @@
    {
       CArray<int,1> index ;
-      if (mask) 
+      if (mask && n==1)
       {
         index.resize(1) ;
@@ -386 +388 @@
     CContext* context = CContext::getCurrent();
     map<int, CArray<size_t,1>> globalIndex ;
-
-    int nbServer = client->serverSize;
     size_t nglo=1 ;
-    CArray<size_t,1> indGlo(nglo) ;
-    for(size_t i=0;i<nglo;i++) indGlo(i) = i ;
-    for (auto& rankServer : client->getRanksServerLeader()) globalIndex[rankServer].reference(indGlo.copy()) ; 
-
+
+    if (type==EDistributionType::ROOT) // Bands distribution to send to file server
+    {
+      for (auto& rankServer : client->getRanksServerLeader())
+      {
+        auto& globalInd =  globalIndex[rankServer] ;
+        if (rankServer==0) 
+        {
+          globalInd.resize(1) ;
+          globalInd(0)=0 ;
+        }
+      }
+    }
+    else if (type==EDistributionType::NONE) // domain is not distributed ie all servers get the same local domain
+    {
+      int nbServer = client->serverSize;
+      CArray<size_t,1> indGlo(nglo) ;
+      for(size_t i=0;i<nglo;i++) indGlo(i) = i ;
+      for (auto& rankServer : client->getRanksServerLeader()) globalIndex[rankServer].reference(indGlo.copy()) ; 
+    }
     remoteElement_[client] = new CDistributedElement(nglo, globalIndex) ;
     remoteElement_[client]->addFullView() ;
@@ -477 +493 @@
       // construct the local dimension and indexes
       auto& globalIndex=localElement_->getGlobalIndex() ;
-      int nk=globalIndex.numElements() ;
+      n=globalIndex.numElements() ;
       // no distribution for scalar => nk ==1 or maybe 0 ?
     }
@@ -504 +520 @@
     CContext* context = CContext::getCurrent();
     localElement_->addView(CElementView::WORKFLOW, serverMask) ;
-    mask = serverMask(0) ;
+    if (serverMask.numElements()==1) mask = serverMask(0) ;
  
     serverFromClientConnector_ = new CGathererConnector(elementFrom_->getView(CElementView::FULL), localElement_->getView(CElementView::WORKFLOW)) ;