Changeset 1278 for XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp

Timestamp:

09/25/17 12:19:49 (7 years ago)

Author:

oabramkina

Message:

Adding a check on field attributes. For now it only concerns freq_op and freq_offset.
It is done so to avoid changing its values on client after the attributes have already been sent to servers.

File:

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

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

@@ -1144 +1144 @@
                << "An operation must be defined for field \"" << getId() << "\".");
 
-       if (freq_op.isEmpty())
-//         freq_op.setValue(TimeStep);
-         freq_op.setValue(NoneDu);
-       if (freq_offset.isEmpty())
-         freq_offset.setValue(NoneDu);
-
        const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
        
@@ -1156 +1150 @@
                                                                              freq_op, freq_offset, outFreq,
                                                                              detectMissingValues, detectMissingValues ? default_value : 0.0));
+
        instantDataFilter->connectOutput(temporalFilter, 0);
 
@@ -1187 +1182 @@
                << "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);
 
@@ -1196 +1188 @@
                                                                              freq_op, freq_offset, outFreq,
                                                                              detectMissingValues, detectMissingValues ? default_value : 0.0));
+
        selfReferenceFilter->connectOutput(temporalFilter, 0);
        return temporalFilter ;
@@ -1566 +1559 @@
 
    /*!
+    * Check on freq_off and freq_op attributes.
+    */
+   void CField::checkAttributes(void)
+   {
+     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.")
+       else
+       {
+         CContext* context = CContext::getCurrent();
+         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_op.setValue(NoneDu);
+         }
+       }
+     }
+     else
+     {
+       if (freq_offset.isEmpty())
+         freq_op.setValue(NoneDu);
+     }
+   }
+
+   /*!
     * Returns string arithmetic expression associated to the field.
     * \return if content is defined return content string, otherwise, if "expr" attribute is defined, return expr string.