Changeset 1307 for XIOS/trunk

Timestamp:

10/13/17 17:45:39 (7 years ago)

Author:

oabramkina

Message:

Backporting r1306 and r1292 to trunk: changes concerned default values of freq_op and freq_offset.

File:

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

XIOS/trunk/src/node/field.cpp

@@ -954 +954 @@
                << "An operation must be defined for field \"" << getId() << "\".");
 
-       if (freq_op.isEmpty())
-         freq_op.setValue(TimeStep);
-       if (freq_offset.isEmpty())
-         freq_offset.setValue(NoneDu);
-
        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(),
@@ -996 +991 @@
                << "An operation must be defined for field \"" << getId() << "\".");
 
-       if (freq_op.isEmpty()) freq_op.setValue(TimeStep);
-       if (freq_offset.isEmpty()) freq_offset.setValue(NoneDu);
-
        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(),
@@ -1452 +1444 @@
      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.")
+       if (operation.getValue()=="instant")
+         freq_op.setValue(file->output_freq.getValue());
        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);
-         }
-       }
-     }
-     else
-     {
-       if (freq_offset.isEmpty())
-         freq_offset.setValue(freq_op.getValue()-TimeStep);
-     }
+         freq_op.setValue(TimeStep);
+     }
+     if (freq_offset.isEmpty())
+       freq_offset.setValue(freq_op.getValue()-TimeStep);
    }