Changeset 1566 for XIOS/trunk/src/node

Timestamp:

08/06/18 17:41:50 (6 years ago)

Author:

oabramkina

Message:

Bugfix for masked distributed axis.

Previously mask wasn't working at all, an exception was thrown.

File:

• XIOS/trunk/src/node/axis.cpp (modified) (4 diffs)

XIOS/trunk/src/node/axis.cpp

@@ -792 +792 @@
           const int begin = serverIndexBegin[*itRank][orderPositionInGrid];
           const int ni    = serverDimensionSizes[*itRank][orderPositionInGrid];
-          const int end   = begin + ni - 1;          
 
           msgs.push_back(CMessage());
           CMessage& msg = msgs.back();
           msg << this->getId();
-          msg << ni << begin << end;          
+          msg << ni << begin;
           msg << isCompressible_;                    
 
@@ -826 +825 @@
   void CAxis::recvDistributionAttribute(CBufferIn& buffer)
   {
-    int ni_srv, begin_srv, end_srv;
-    buffer >> ni_srv >> begin_srv >> end_srv;    
+    int ni_srv, begin_srv;
+    buffer >> ni_srv >> begin_srv;
     buffer >> isCompressible_;            
 
@@ -1138 +1137 @@
     globalLocalIndexMap_.rehash(std::ceil(index.numElements()/globalLocalIndexMap_.max_load_factor()));
     nbIndexGlob = 0;
+    int nbIndLoc = 0;
     for (idx = 0; idx < nbReceived; ++idx)
     {
@@ -1144 +1144 @@
       {
          gloInd = tmp(ind);
+         nbIndLoc = (gloInd % n_glo)-begin;
          if (0 == globalLocalIndexMap_.count(gloInd))
          {
-           index(nbIndexGlob) = gloInd % n_glo;           
-           globalLocalIndexMap_[gloInd] = nbIndexGlob;  
+           index(nbIndLoc) = gloInd % n_glo;
+           globalLocalIndexMap_[gloInd] = nbIndLoc;
            ++nbIndexGlob;
          }