Changeset 1292 for XIOS

Timestamp:

10/04/17 23:16:30 (7 years ago)

Author:

ymipsl

Message:

Fix problems when checking field temporal attributes.

YM

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp (modified) (3 diffs)

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

@@ -1145 +1145 @@
 
        const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
-       
+       checkAttributes() ;   
        boost::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation,
                                                                              CContext::getCurrent()->getCalendar()->getInitDate(),
@@ -1183 +1183 @@
 
        const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
-
+       checkAttributes() ;   
        boost::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation,
                                                                              CContext::getCurrent()->getCalendar()->getInitDate(),
@@ -1565 +1565 @@
      if (freq_op.isEmpty())
      {
+/*
        if (!freq_offset.isEmpty())
          ERROR("CField::checkAttributes(void)",
                << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] "
                << "Attribute freq_offset cannot be defined if attribute freq_op is not defined. "
-               << "Please define freq_op.")
+               << "Please define freq_op.") */
+       if (operation.getValue()=="instant")
+       {
+         freq_op.setValue(file->output_freq.getValue());
+         if (freq_offset.isEmpty()) freq_offset.setValue(file->output_freq.getValue()-TimeStep);
+       }
        else
        {
-         if (operation.getValue()=="instant")
-         {
-           freq_op.setValue(file->output_freq.getValue());
-           freq_offset.setValue(file->output_freq.getValue()-TimeStep);
-         }
-         else
-         {
-           freq_op.setValue(TimeStep);
-           freq_offset.setValue(freq_op.getValue()-TimeStep);
-         }
+         freq_op.setValue(TimeStep);
+         if (freq_offset.isEmpty()) freq_offset.setValue(freq_op.getValue()-TimeStep);
        }
      }