Changeset 906 for XIOS/trunk/src/node/axis.cpp

Timestamp:

07/28/16 10:56:52 (8 years ago)

Author:

mhnguyen

Message:

Fixing bug: Ticket 98

+) Correct the way to distribute index of domain (axis) in case there are more
clients than number of index

Test
+) On Curie
+) Small grid (2x2x1) and 6 clients - 1 server: Pass

File:

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

XIOS/trunk/src/node/axis.cpp

@@ -400 +400 @@
     int nbServer = client->serverSize;
     int range, clientSize = client->clientSize;
+    int rank = client->clientRank;
 
     size_t ni = this->n.getValue();
@@ -453 +454 @@
       for (int i = 0; i < nGlobAxis.size(); ++i) globalSizeIndex *= nGlobAxis[i];
       indexBegin = 0;
-      for (int i = 0; i < clientSize; ++i)
-      {
-        range = globalSizeIndex / clientSize;
-        if (i < (globalSizeIndex%clientSize)) ++range;
-        if (i == client->clientRank) break;
-        indexBegin += range;
-      }
-      indexEnd = indexBegin + range - 1;
+      if (globalSizeIndex <= clientSize)
+      {
+        indexBegin = rank%globalSizeIndex;
+        indexEnd = indexBegin;
+      }
+      else
+      {
+        for (int i = 0; i < clientSize; ++i)
+        {
+          range = globalSizeIndex / clientSize;
+          if (i < (globalSizeIndex%clientSize)) ++range;
+          if (i == client->clientRank) break;
+          indexBegin += range;
+        }
+        indexEnd = indexBegin + range - 1;
+      }
 
       CServerDistributionDescription serverDescription(nGlobAxis, nbServer);