Changeset 1015 for XIOS/trunk/src

Timestamp:

01/05/17 14:21:17 (7 years ago)

Author:

oabramkina

Message:

Check if output_frequency >= timestep added.
Files with output_frequency < timestep are considered to be disabled.

Location:

XIOS/trunk/src

Files:

• duration.cpp (modified) (1 diff)
• duration.hpp (modified) (1 diff)
• node/context.cpp (modified) (1 diff)

XIOS/trunk/src/duration.cpp

@@ -24 +24 @@
         hour = duration.hour; minute = duration.minute; second = duration.second; timestep = duration.timestep;
         return *this;
+      }
+
+      bool operator<(CDuration a, CDuration b)
+      {
+        double aSeconds = a.second + 60.*(a.minute + 60.*(a.hour + 24.*(a.day + a.year*365.25) ) );
+        double bSeconds = b.second + 60.*(b.minute + 60.*(b.hour + 24.*(b.day + b.year*365.25) ) );
+        return (aSeconds < bSeconds);
       }
 

XIOS/trunk/src/duration.hpp

@@ -22 +22 @@
             /// Opérateurs ///
             CDuration& operator=(const CDuration& duration);
+
+            friend bool operator<(CDuration a, CDuration b);
 
             friend StdOStream& operator<<(StdOStream& out, const CDuration& duration);

XIOS/trunk/src/node/context.cpp

@@ -571 +571 @@
          {
             if (allFiles[i]->enabled.getValue()) // Si l'attribut 'enabled' est fixé à vrai.
+            {
+              if ( allFiles[i]->output_freq.getValue() < 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;
+              }
+              else
                enabledFiles.push_back(allFiles[i]);
+            }
          }
-         else enabledFiles.push_back(allFiles[i]); // otherwise true by default
-
+         else
+         {
+           if ( allFiles[i]->output_freq.getValue() < 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;
+           }
+           else
+             enabledFiles.push_back(allFiles[i]); // otherwise true by default
+         }
 
       if (enabledFiles.size() == 0)