Changeset 471 for XIOS/trunk

Timestamp:

01/30/14 15:56:39 (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

Location:

XIOS/trunk/src

Files:

• functor.cpp (modified) (2 diffs)
• functor.hpp (modified) (2 diffs)

XIOS/trunk/src/functor.cpp

@@ -9 +9 @@
 
       CFunctor::CFunctor(const StdString & id, CArray<double, 1>& doutput)
-         : SuperClass(id), doutput(doutput), nbcall(0)
+         : SuperClass(id), doutput(doutput), nbcall(0),hasMissingValue(false)
       { /* Ne rien faire de plus */  }
+ 
+      CFunctor::CFunctor(const StdString & id, CArray<double, 1>& doutput, double missingValue)
+         : SuperClass(id), doutput(doutput), nbcall(0),hasMissingValue(true),missingValue(missingValue)
+      { 
+        /* Ne rien faire de plus */
+      }
 
       CFunctor::~CFunctor(void)
@@ -52 +58 @@
       void CFunctor::final(void) 
       {
-         this->nbcall = 0;
+        this->nbcall = 0;
       } 
 

XIOS/trunk/src/functor.hpp

@@ -43 +43 @@
             CFunctor(void);                             // Not implemented.
             CFunctor(const StdString & id, CArray<double,1>& doutput);
-            CFunctor(const CFunctor & functor);         // Not implemented.
+            CFunctor(const StdString & id, CArray<double,1>& doutput, double missingValue);
+           CFunctor(const CFunctor & functor);         // Not implemented.
             CFunctor(const CFunctor * const functor);   // Not implemented.
          protected :
@@ -50 +51 @@
             /// Propriétés protégées ///   
             int nbcall;            
+            bool hasMissingValue ;
+            double missingValue ;
+            CArray<int,1> nbcalls ;
       }; // class CFunctor
    } // namespace func