Changeset 906 for XIOS/trunk/src/node/domain.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/domain.cpp (modified) (6 diffs)

XIOS/trunk/src/node/domain.cpp

@@ -532 +532 @@
        if (bounds_lon_end.isEmpty()) bounds_lon_end=180.-1e-8 ;
      }
-     
+
      for(j=0;j<nj;++j)
        for(i=0;i<ni;++i)
@@ -921 +921 @@
      size_t zoom_jend=global_zoom_jbegin+global_zoom_nj-1 ;
 
-     
+
      size_t dn=data_i_index.numElements() ;
      int i,j ;
      size_t k,ind ;
-     
+
      for(k=0;k<dn;k++)
      {
@@ -936 +936 @@
        {
           i=(data_i_index(k)+data_ibegin)%ni ;
-          j=(data_i_index(k)+data_ibegin)/ni ;          
+          j=(data_i_index(k)+data_ibegin)/ni ;
        }
 
@@ -947 +947 @@
      }
    }
-       
-         
-     
-
-     
-
-   
+
+
+
+
+
+
+
    void CDomain::checkEligibilityForCompressedOutput(void)
    {
@@ -1358 +1358 @@
     CContextClient* client=context->client ;
     int nbServer=client->serverSize;
+    int rank = client->clientRank;
     bool doComputeGlobalIndexServer = true;
 
@@ -1445 +1446 @@
     for (int i = 0; i < nGlobDomain_.size(); ++i) globalSizeIndex *= nGlobDomain_[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(nGlobDomain_, nbServer);