Changeset 1093

Timestamp:

04/13/17 13:19:49 (6 years ago)

Author:

rlacroix

Message:

Fix some bugs when using indexed output.

The grid was mistakenly modified which caused some weird behaviors.

Fixes tickets #125 and #127.

File:

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

XIOS/trunk/src/node/grid.cpp

@@ -1002 +1002 @@
   void CGrid::computeCompressedIndex()
   {
-    compressedOutIndexFromClient = outIndexFromClient;
-
     std::map<size_t, size_t> indexes;
 
     {
-      std::map<int, CArray<size_t,1> >::const_iterator it = compressedOutIndexFromClient.begin();
-      std::map<int, CArray<size_t,1> >::const_iterator itEnd = compressedOutIndexFromClient.end();
+      std::map<int, CArray<size_t,1> >::const_iterator it = outIndexFromClient.begin();
+      std::map<int, CArray<size_t,1> >::const_iterator itEnd = outIndexFromClient.end();
       for (; it != itEnd; ++it)
       {
         for (int i = 0; i < it->second.numElements(); ++i)
           indexes.insert(std::make_pair(it->second(i), 0));
+
+        compressedOutIndexFromClient[it->first].resize(it->second.numElements());
       }
     }
@@ -1028 +1028 @@
       for (; it != itEnd; ++it)
       {
+        const CArray<size_t,1>& outIndex = outIndexFromClient[it->first];
         for (int i = 0; i < it->second.numElements(); ++i)
-          it->second(i) = indexes[it->second(i)];
+          it->second(i) = indexes[outIndex(i)];
       }
     }