Changeset 1920 for XIOS

Timestamp:

07/20/20 16:05:09 (4 years ago)

Author:

yushan

Message:

trunk : raise error if freq_op > output_freq

Location:

XIOS/trunk

Files:

• generic_testcase/context_atm.xml (modified) (1 diff)
• src/calendar_util.cpp (modified) (1 diff)
• src/calendar_util.hpp (modified) (1 diff)
• src/node/field.cpp (modified) (1 diff)

XIOS/trunk/generic_testcase/context_atm.xml

@@ -299 +299 @@
 
   <file_definition  type="one_file" >
-    <file id="atm_output_reduction" output_freq="6ts" type="one_file" enabled="true">
+    <file id="atm_output_reduction" output_freq="6ts" type="one_file" enabled="true" split_freq="12ts"  >
        <field field_ref="field2D" freq_op="3ts" operation="average" name="field2D_average"/>
        <field field_ref="field2D" freq_op="3ts" operation="accumulate" name="field2D_sum"/>

XIOS/trunk/src/calendar_util.cpp

@@ -45 +45 @@
     }
 
+    bool operator<(const CDuration& dur1, const CDuration& dur2)
+    {
+      if (dur1.year < dur2.year)
+        return true;
+      else if (dur1.year == dur2.year)
+      {
+        if (dur1.month < dur2.month)
+          return true;
+        else if (dur1.month == dur2.month)
+        {
+          if (dur1.day < dur2.day)
+            return true;
+          else if (dur1.day == dur2.day)
+          {
+            if (dur1.hour < dur2.hour)
+              return true;
+            else if (dur1.hour == dur2.hour)
+            {
+              if (dur1.minute < dur2.minute)
+                return true;
+              else if (dur1.minute == dur2.minute)
+              {
+                if (dur1.second < dur2.second)
+                  return true;
+                else if (dur1.second == dur2.second)
+                  return (dur1.timestep < dur2.timestep);
+              }
+            }
+          }
+        }
+      }
+      return false;
+    }
+
+
+    bool operator>(const CDuration& dur1, const CDuration& dur2)
+    {
+      if (dur1.year > dur2.year)
+        return true;
+      else if (dur1.year == dur2.year)
+      {
+        if (dur1.month > dur2.month)
+          return true;
+        else if (dur1.month == dur2.month)
+        {
+          if (dur1.day > dur2.day)
+            return true;
+          else if (dur1.day == dur2.day)
+          {
+            if (dur1.hour > dur2.hour)
+              return true;
+            else if (dur1.hour == dur2.hour)
+            {
+              if (dur1.minute > dur2.minute)
+                return true;
+              else if (dur1.minute == dur2.minute)
+              {
+                if (dur1.second > dur2.second)
+                  return true;
+                else if (dur1.second == dur2.second)
+                  return (dur1.timestep > dur2.timestep);
+              }
+            }
+          }
+        }
+      }
+      return false;
+    }
+
+
+
     //-----------------------------------------------------------------
 

XIOS/trunk/src/calendar_util.hpp

@@ -17 +17 @@
       CDuration operator-(const CDuration& ddr);
 
+      bool operator>(const CDuration& ddr, const CDuration& dr);
+      bool operator<(const CDuration& ddr, const CDuration& dr);
+      
       CDate operator+(const CDate& dt, const CDuration& dr); // Non testée.
       CDate operator-(const CDate& dt, const CDuration& dr);

XIOS/trunk/src/node/field.cpp

@@ -2050 +2050 @@
          freq_op.setValue(TimeStep);
      }
+     else
+     {
+       //if(file->output_freq.getValue() < freq_op.getValue())
+       if(freq_op.getValue() > file->output_freq.getValue() )
+       {
+         ERROR("void CField::checkTimeAttributes(void)",
+               << "output file has output_freq < freq_op" << std::endl
+               << "field_id = "<< getId() << std::endl
+               << "file_id = "<< file->getId() << std::endl
+               << "output_freq = "<< file->output_freq.getValue() << std::endl
+               << "freq_op = "<< freq_op.getValue() << std::endl)
+       }
+     }
      if (freq_offset.isEmpty())
        freq_offset.setValue(isFieldRead ? NoneDu : (freq_op.getValue() - TimeStep));