Changeset 1371 for XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.cpp

Timestamp:

12/12/17 14:09:06 (7 years ago)

Author:

oabramkina

Message:

Fixing a bug in buffer evaluation: previously axis attributes were not evaluated correctly.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.cpp (modified) (3 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.cpp

@@ -111 +111 @@
      // The grid indexes require a similar size as the actual data
      std::map<int, StdSize> dataSizes = getDataBufferSize(client, "", bufferForWriting);
-     // for (size_t i = 0; i < dataSizes.size(); ++i)
-     // {
-       std::map<int, StdSize>::iterator it, itE = dataSizes.end();
-       for (it = dataSizes.begin(); it != itE; ++it)
-       {
-         it->second += 2 * sizeof(bool);
-         if (it->second > attributesSizes[it->first])
-           attributesSizes[it->first] = it->second;
-       }
-     // }
-
+     std::map<int, StdSize>::iterator it, itE = dataSizes.end();
+     for (it = dataSizes.begin(); it != itE; ++it)
+     {
+       it->second += 2 * sizeof(bool);
+       if (it->second > attributesSizes[it->first])
+         attributesSizes[it->first] = it->second;
+     }
      
      // Account for the axis attributes
@@ -127 +123 @@
      for (size_t i = 0; i < axisList.size(); ++i)
      {
-       std::map<int, StdSize> axisAttBuffSize = axisList[i]->getAttributesBufferSize(client);       
+       std::map<int, StdSize> axisAttBuffSize = axisList[i]->getAttributesBufferSize(client, getGlobalDimension(),axisPositionInGrid_[i]);
        for (it = axisAttBuffSize.begin(), itE = axisAttBuffSize.end(); it != itE; ++it)
        {
+         it->second += 2 * sizeof(bool);
          if (it->second > attributesSizes[it->first])
            attributesSizes[it->first] = it->second;
@@ -142 +139 @@
        for (it = domAttBuffSize.begin(), itE = domAttBuffSize.end(); it != itE; ++it)
        {
+         it->second += 2 * sizeof(bool);
          if (it->second > attributesSizes[it->first])
            attributesSizes[it->first] = it->second;