Changeset 1028 for XIOS/trunk/src/node/context.cpp

Timestamp:

01/12/17 14:37:00 (7 years ago)

Author:

oabramkina

Message:

Correcting a bug introduced in r1015 with a check if output_frequency >= timestep.

File:

• XIOS/trunk/src/node/context.cpp (modified) (3 diffs)

XIOS/trunk/src/node/context.cpp

@@ -566 +566 @@
    {
       const std::vector<CFile*> allFiles = CFile::getAll();
+      const CDate& initDate = calendar->getInitDate();
 
       for (unsigned int i = 0; i < allFiles.size(); i++)
@@ -572 +573 @@
             if (allFiles[i]->enabled.getValue()) // Si l'attribut 'enabled' est fixé à vrai.
             {
-              if ( allFiles[i]->output_freq.getValue() < this->getCalendar()->getTimeStep())
+              if ((initDate + allFiles[i]->output_freq.getValue()) < (initDate + this->getCalendar()->getTimeStep()))
               {
                 error(0)<<"WARNING: void CContext::findEnabledFiles()"<<endl
-                    << "Output frequency in file \""<<allFiles[i]->getId()
-                    <<"\" is greater than the time step. File will not be written."<<endl;
+                    << "Output frequency in file \""<<allFiles[i]->getFileOutputName()
+                    <<"\" is less than the time step. File will not be written."<<endl;
               }
               else
@@ -584 +585 @@
          else
          {
-           if ( allFiles[i]->output_freq.getValue() < this->getCalendar()->getTimeStep())
+           if ( (initDate + allFiles[i]->output_freq.getValue()) < (initDate + this->getCalendar()->getTimeStep()))
            {
              error(0)<<"WARNING: void CContext::findEnabledFiles()"<<endl
-                 << "Output frequency in file \""<<allFiles[i]->getId()
-                 <<"\" is greater than the time step. File will not be written."<<endl;
+                 << "Output frequency in file \""<<allFiles[i]->getFileOutputName()
+                 <<"\" is less than the time step. File will not be written."<<endl;
            }
            else