Changeset 874

Timestamp:

06/14/16 16:28:11 (8 years ago)

Author:

mhnguyen

Message:

Fixing a bug on activating zoom on axis or domain

+) Correct index of zoom mask

Test
+) On Curie
+) All standard tests (test_client, test_complete) pass*
+) All other tests are correct.

File:

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

XIOS/trunk/src/distribution_client.cpp

@@ -441 +441 @@
   innerLoopSize = dataNIndex_[0];
   int countLocalData = 0;
-  std::vector<int> correctOuterIndex(numElement_,0);
+  std::vector<int> correctIndexOfElement(numElement_,0);
   bool isOuterIndexCorrect = true;
   while (idx < ssize)
@@ -450 +450 @@
       {
         idxLoop[i] = 0;
-        correctOuterIndex[i] = 0;
+        correctIndexOfElement[i] = 0;
         ++idxLoop[i+1];
-        if (isOuterIndexCorrect) ++correctOuterIndex[i+1];
+        if (isOuterIndexCorrect) ++correctIndexOfElement[i+1];
       }
     }
@@ -463 +463 @@
       if (elementIndexData_[i](idxLoop[i]))
       {
-        currentIndex[i] = elementLocalIndex_[i](correctOuterIndex[i]);
-        currentGlobalIndex[i] = elementGlobalIndex_[i](correctOuterIndex[i]);
+        currentIndex[i] = elementLocalIndex_[i](correctIndexOfElement[i]);
+        currentGlobalIndex[i] = elementGlobalIndex_[i](correctIndexOfElement[i]);
         isIndexElementDataCorrect &= true;
       }
@@ -472 +472 @@
     isOuterIndexCorrect = isIndexElementDataCorrect;
 
-    // Inner most index
-    int correctIndexElement = 0;
-    for (int i = 0; i < innerLoopSize; ++i)
-    {
-      bool isCurrentIndexDataCorrect = isOuterIndexCorrect;
-      if (elementIndexData_[0](i))
-      {
-        currentIndex[0] = elementLocalIndex_[0](correctIndexElement);
-        currentGlobalIndex[0] = elementGlobalIndex_[0](correctIndexElement);
-        isCurrentIndexDataCorrect &= true;
-        ++correctIndexElement;
-      }
-      else isCurrentIndexDataCorrect = false;
-
-      if (isCurrentIndexDataCorrect)
-      {
-        int gridMaskIndex = 0;
-        for (int k = 0; k < this->numElement_; ++k)
-        {
-          gridMaskIndex += (currentIndex[k])*elementNLocal_[k];
-        }
-
-        if (gridMask_(gridMaskIndex))
-        {
-          localDataIndex_[indexLocalDataOnClientCount] = countLocalData;
-          bool isIndexOnServer = true;
-          for (int idxElement = 0; idxElement < this->numElement_; ++idxElement)
+    if (isOuterIndexCorrect)
+    {
+      // Inner most index
+      int correctIndexInnerElement = 0;
+      for (int i = 0; i < innerLoopSize; ++i)
+      {
+        bool isCurrentIndexDataCorrect = isOuterIndexCorrect;
+        if (elementIndexData_[0](i))
+        {
+          currentIndex[0] = elementLocalIndex_[0](correctIndexInnerElement);
+          currentGlobalIndex[0] = elementGlobalIndex_[0](correctIndexInnerElement);
+          isCurrentIndexDataCorrect &= true;
+          ++correctIndexInnerElement;
+        }
+        else isCurrentIndexDataCorrect = false;
+
+        if (isCurrentIndexDataCorrect)
+        {
+          int gridMaskIndex = 0;
+          for (int k = 0; k < this->numElement_; ++k)
           {
-            isIndexOnServer = isIndexOnServer && elementZoomMask_[idxElement](idxLoop[idxElement]);
+            gridMaskIndex += (currentIndex[k])*elementNLocal_[k];
           }
 
-          if (isIndexOnServer)
+          if (gridMask_(gridMaskIndex))
           {
-            size_t globalIndex = 0;
-            for (int k = 0; k < numElement_; ++k)
+            localDataIndex_[indexLocalDataOnClientCount] = countLocalData;
+            bool isIndexOnServer = true;
+            for (int idxElement = 0; idxElement < this->numElement_; ++idxElement)
             {
-              globalIndex += (currentGlobalIndex[k])*elementNGlobal_[k];
+              isIndexOnServer = isIndexOnServer && elementZoomMask_[idxElement](correctIndexOfElement[idxElement]);
             }
-            globalLocalDataSendToServerMap_[globalIndex] = indexLocalDataOnClientCount;
-            localMaskIndex_[indexSend2ServerCount] = gridMaskIndex;
-            ++indexSend2ServerCount;
+
+            if (isIndexOnServer)
+            {
+              size_t globalIndex = 0;
+              for (int k = 0; k < numElement_; ++k)
+              {
+                globalIndex += (currentGlobalIndex[k])*elementNGlobal_[k];
+              }
+              globalLocalDataSendToServerMap_[globalIndex] = indexLocalDataOnClientCount;
+              localMaskIndex_[indexSend2ServerCount] = gridMaskIndex;
+              ++indexSend2ServerCount;
+            }
+            ++indexLocalDataOnClientCount;
           }
-          ++indexLocalDataOnClientCount;
-        }
-      }
-      ++countLocalData;
+        }
+        ++countLocalData;
+        correctIndexOfElement[0] = correctIndexInnerElement;;
+      }
     }
     idxLoop[0] += innerLoopSize;