Changeset 729 for XIOS

Timestamp:

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

Author:

rlacroix

Message:

Ensure all needed buffers are properly initialized with the minimum buffer size.

File:

• XIOS/trunk/src/node/context.cpp (modified) (1 diff)

XIOS/trunk/src/node/context.cpp

@@ -275 +275 @@
 
      std::map<int, StdSize> bufferSize = getDataSize();
-     if (bufferSize.empty())
-     {
-       if (client->isServerLeader())
-       {
-         const std::list<int>& ranks = client->getRanksServerLeader();
-         for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
-           bufferSize[*itRank] = bufferSizeMin;
-       }
-       else
-        return;
-     }
-     else
-     {
-       std::map<int, StdSize>::iterator it  = bufferSize.begin(),
-                                        ite = bufferSize.end();
-       for (; it != ite; ++it)
-         it->second = (it->second < bufferSizeMin) ? bufferSizeMin : it->second;
-     }
-
-     client->setBufferSize(bufferSize);
+     std::map<int, StdSize>::iterator it  = bufferSize.begin(),
+                                      ite = bufferSize.end();
+     for (; it != ite; ++it)
+       if (it->second < bufferSizeMin) it->second = bufferSizeMin;
+
+     if (client->isServerLeader())
+     {
+       const std::list<int>& ranks = client->getRanksServerLeader();
+       for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
+         if (!bufferSize.count(*itRank)) bufferSize[*itRank] = bufferSizeMin;
+     }
+
+     if (!bufferSize.empty())
+       client->setBufferSize(bufferSize);
    }