Changeset 730 for XIOS

Timestamp:

10/13/15 15:14:22 (9 years ago)

Author:

rlacroix

Message:

Fix: Really abide by the automatic buffer size mode (performance or memory).

Location:

XIOS/trunk/src/node

Files:

• context.cpp (modified) (5 diffs)
• context.hpp (modified) (1 diff)

XIOS/trunk/src/node/context.cpp

@@ -25 +25 @@
       : CObjectTemplate<CContext>(), CContextAttributes()
       , calendar(), hasClient(false), hasServer(false), isPostProcessed(false), finalized(false)
-      , dataSize_(), idServer_(), client(0), server(0)
+      , idServer_(), client(0), server(0)
    { /* Ne rien faire de plus */ }
 
@@ -31 +31 @@
       : CObjectTemplate<CContext>(id), CContextAttributes()
       , calendar(), hasClient(false), hasServer(false), isPostProcessed(false), finalized(false)
-      , dataSize_(), idServer_(), client(0), server(0)
+      , idServer_(), client(0), server(0)
    { /* Ne rien faire de plus */ }
 
@@ -795 +795 @@
      CFile::mode_attr::t_enum mode = hasClient ? CFile::mode_attr::write : CFile::mode_attr::read;
 
-     // Set of grid used by enabled fields
-     std::set<StdString> usedGrid;
+     std::map<int, StdSize> dataSize;
 
      // Find all reference domain and axis of all active fields
-     int numEnabledFiles = this->enabledFiles.size();
-     for (int i = 0; i < numEnabledFiles; ++i)
+     size_t numEnabledFiles = this->enabledFiles.size();
+     for (size_t i = 0; i < numEnabledFiles; ++i)
      {
        CFile* file = this->enabledFiles[i];
@@ -808 +807 @@
        {
          std::vector<CField*> enabledFields = file->getEnabledFields();
-         int numEnabledFields = enabledFields.size();
-         for (int j = 0; j < numEnabledFields; ++j)
+         size_t numEnabledFields = enabledFields.size();
+         for (size_t j = 0; j < numEnabledFields; ++j)
          {
-           StdString currentGrid = enabledFields[j]->grid->getId();
            const std::map<int, StdSize> mapSize = enabledFields[j]->getGridDataSize();
-           if (dataSize_.empty())
+           std::map<int, StdSize>::const_iterator it = mapSize.begin(), itE = mapSize.end();
+           for (; it != itE; ++it)
            {
-             dataSize_ = mapSize;
-             usedGrid.insert(currentGrid);
-           }
-           else
-           {
-             std::map<int, StdSize>::const_iterator it = mapSize.begin(), itE = mapSize.end();
-             if (usedGrid.find(currentGrid) == usedGrid.end())
-             {
-               for (; it != itE; ++it)
-               {
-                 if (0 < dataSize_.count(it->first)) dataSize_[it->first] += it->second;
-                 else dataSize_.insert(make_pair(it->first, it->second));
-               }
-             } else
-             {
-               for (; it != itE; ++it)
-               {
-                 if (0 < dataSize_.count(it->first))
-                  if (CXios::isOptPerformance) dataSize_[it->first] += it->second;
-                  else
-                  {
-                    if (dataSize_[it->first] < it->second) dataSize_[it->first] = it->second;
-                  }
-                 else dataSize_.insert(make_pair(it->first, it->second));
-               }
-             }
+             // If dataSize[it->first] does not exist, it will be zero-initialized
+             // so we can use it safely without checking for its existance
+             if (CXios::isOptPerformance)
+               dataSize[it->first] += it->second;
+             else if (dataSize[it->first] < it->second)
+               dataSize[it->first] = it->second;
            }
          }
@@ -846 +825 @@
      }
 
-     return dataSize_;
+     return dataSize;
    }
 

XIOS/trunk/src/node/context.hpp

@@ -222 +222 @@
          bool isPostProcessed;
          bool finalized;
-         std::map<int, StdSize> dataSize_;
          StdString idServer_;
          CGarbageCollector garbageCollector;