Changeset 318 for XIOS/trunk/src/node/file.cpp

Timestamp:

02/21/12 15:34:27 (12 years ago)

Author:

ymipsl

Message:

• Adding new file attribut : sync_freq : flush file for a given frequency
• Now, when a file has a single domain, domain id is not anymore appended to the coordinate name.

YM

File:

• XIOS/trunk/src/node/file.cpp (modified) (4 diffs)

XIOS/trunk/src/node/file.cpp

@@ -11 +11 @@
 #include "context_server.hpp"
 #include "nc4_data_output.hpp"
+#include "calendar_util.hpp"
+#include "date.hpp"
 
 
@@ -125 +127 @@
 
    //----------------------------------------------------------------
-
+   bool CFile::isSyncTime(void)
+   {
+     shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+     date::CDate& currentDate=context->calendar->getCurrentDate() ;
+     if (! sync_freq.isEmpty())
+     {
+       if (*lastSync+syncFreq < currentDate)
+       {
+         *lastSync=currentDate ;
+         return true ;
+        }
+      }
+      return false ;
+    }
+      
    void CFile::createHeader(void)
    {
-    
+      shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
+
+      if (! sync_freq.isEmpty()) syncFreq = date::CDuration::FromString(sync_freq.getValue());
+      lastSync=new date::CDate(context->calendar->getCurrentDate()) ;
+      
       std::vector<boost::shared_ptr<CField> >::iterator it, end = this->enabledFields.end();
 
       AllDomainEmpty=true ;
+      set<CDomain*> setDomain ;
       for (it = this->enabledFields.begin() ;it != end; it++)
       {
          boost::shared_ptr<CField> field = *it;
          AllDomainEmpty&=field->grid->domain->isEmpty() ;
-      }
-      
+         setDomain.insert(field->grid->domain.get()) ;
+      }
+      nbDomain=setDomain.size() ;
+
       if (!AllDomainEmpty ||  type.getValue()=="one_file")
       {
@@ -156 +179 @@
          } 
          
-         shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
          CContextServer* server=context->server ;
 
@@ -188 +210 @@
      if (!AllDomainEmpty ||  type.getValue()=="one_file")
        this->data_out->closeFile();
+     delete lastSync ;
    }
    //----------------------------------------------------------------