Changeset 1372 for XIOS/dev/XIOS_DEV_CMIP6

Timestamp:

12/12/17 16:53:21 (6 years ago)

Author:

oabramkina

Message:

Improving buffer evaluation in the (rare) case of a context with no active fields.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/context.cpp (modified) (2 diffs)

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

@@ -308 +308 @@
    {
       // Estimated minimum event size for small events (10 is an arbitrary constant just for safety)
-      const size_t minEventSize = CEventClient::headerSize + getIdServer().size() + 10 * sizeof(int);
+     const size_t minEventSize = CEventClient::headerSize + getIdServer().size() + 10 * sizeof(int);
 
       // Ensure there is at least some room for 20 of such events in the buffers
@@ -1482 +1482 @@
                                                            CContextClient* contextClient, bool bufferForWriting /*= "false"*/)
    {
-     std::map<int, StdSize> attributesSize;
+         // As calendar attributes are sent even if there are no active files or fields, maps are initialized according the size of calendar attributes
+     std::map<int, StdSize> attributesSize = CCalendarWrapper::get(CCalendarWrapper::GetDefName())->getMinimumBufferSizeForAttributes(contextClient);
+     maxEventSize = CCalendarWrapper::get(CCalendarWrapper::GetDefName())->getMinimumBufferSizeForAttributes(contextClient);
 
      std::vector<CFile*>& fileList = this->enabledFiles;