Changeset 926 for XIOS/trunk

Timestamp:

09/08/16 11:18:50 (8 years ago)

Author:

rlacroix

Message:

Fix: Make sure that the connected servers are properly set for non-distributed grids.

This could cause the buffers not to be correctly allocated. However this was unlikely to cause any real issues since XIOS tries to recover when an unexpected buffer is requested.

File:

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

XIOS/trunk/src/node/grid.cpp

@@ -461 +461 @@
      isDataDistributed_= clientDistribution_->isDataDistributed();
 
+     connectedServerRank_.clear();
+
      if (!doGridHaveDataDistributed())
      {
@@ -467 +469 @@
           size_t ssize = clientDistribution_->getLocalDataIndexOnClient().size();
           for (int rank = 0; rank < client->serverSize; ++rank)
+          {
+            connectedServerRank_.push_back(rank);
             connectedDataSize_[rank] = ssize;
+          }
         }
         return;
@@ -506 +511 @@
      }
 
-     connectedServerRank_.clear();
      for (itGlobalMap = itbGlobalMap; itGlobalMap != iteGlobalMap; ++itGlobalMap) {
        connectedServerRank_.push_back(itGlobalMap->first);
@@ -928 +932 @@
     storeIndex_client.resize(1);
     storeIndex_client(0) = 0;
+
+    connectedServerRank_.clear();
+
     if (0 == client->clientRank)
     {
       for (int rank = 0; rank < client->serverSize; ++rank)
+      {
+        connectedServerRank_.push_back(rank);
         connectedDataSize_[rank] = 1;
+      }
     }
     isDataDistributed_ = false;