Changeset 1286

Timestamp:

10/02/17 10:50:43 (6 years ago)

Author:

oabramkina

Message:

Backporting r1280 to trunk: adding a check on the field attributes freq_op and freq_offset and changing their default values.

Location:

XIOS/trunk/src

Files:

• filter/temporal_filter.cpp (modified) (1 diff)
• node/field.cpp (modified) (1 diff)
• node/field.hpp (modified) (1 diff)
• node/file.cpp (modified) (1 diff)

XIOS/trunk/src/filter/temporal_filter.cpp

@@ -14 +14 @@
     , isOnceOperation(functor->timeType() == func::CFunctor::once)
     , isInstantOperation(functor->timeType() == func::CFunctor::instant)
-    // If we can optimize the sampling when dealing with an instant functor we do it
-    , samplingFreq((isInstantOperation && samplingFreq == TimeStep && samplingOffset == NoneDu) ? opFreq : samplingFreq)
-    , samplingOffset((isInstantOperation && samplingFreq == TimeStep && samplingOffset == NoneDu) ? opFreq - initDate.getRelCalendar().getTimeStep() : samplingOffset)
+    , samplingFreq(samplingFreq)
+    , samplingOffset(samplingOffset)
     , opFreq(opFreq)
     , nextSamplingDate(initDate + this->samplingOffset + initDate.getRelCalendar().getTimeStep())

XIOS/trunk/src/node/field.cpp

@@ -1446 +1446 @@
 
    /*!
+    * 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
+       {
+         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);
+     }
+   }
+
+   /*!
     * 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.

XIOS/trunk/src/node/field.hpp

@@ -176 +176 @@
         void sendAddAllVariables();
 
+        /// Vérifications ///
+        void checkAttributes(void);
 
         const std::vector<StdString>& getRefDomainAxisIds();

XIOS/trunk/src/node/file.cpp

@@ -1098 +1098 @@
        CField* field = this->enabledFields[i];
        this->sendAddField(field->getId());
+       field->checkAttributes();
        field->sendAllAttributesToServer();
        field->sendAddAllVariables();