Changeset 470 for XIOS/trunk/src/node/field.cpp

Timestamp:

01/30/14 15:55:42 (10 years ago)

Author:

ymipsl

Message:

Enhancement : using new field attribute "detect_missing_value=true" adn defining a default value, the temporal operator (average, minimum, maximum, accumulate ...) detect missing value in the field and don't take them into account to perform the operation.

YM

File:

• XIOS/trunk/src/node/field.cpp (modified) (1 diff)

XIOS/trunk/src/node/field.cpp

@@ -458 +458 @@
         else isOnceOperation=false;
         isFirstOperation=true;
-
+        
+          
 #define DECLARE_FUNCTOR(MType, mtype)              \
    if  (operation.getValue().compare(#mtype) == 0) \
    {                                               \
-      boost::shared_ptr<func::CFunctor>            \
-            foperation_(new C##MType(this->data)); \
-      this->foperation = foperation_;              \
+      if (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value==true) \
+      { \
+        boost::shared_ptr<func::CFunctor> foperation_(new C##MType(this->data,default_value)); \
+        this->foperation = foperation_; \ 
+      } \
+      else \
+      { \
+        boost::shared_ptr<func::CFunctor> foperation_(new C##MType(this->data)); \
+        this->foperation = foperation_;  \
+      } \
       return;                                      \
    }