Changeset 470 for XIOS/trunk/src/functor/accumulate.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/functor/accumulate.cpp (modified) (2 diffs)

XIOS/trunk/src/functor/accumulate.cpp

@@ -9 +9 @@
 
       CAccumulate::CAccumulate(CArray<double,1>& doutput)
-         : SuperClass(StdString("average"), doutput)
+         : SuperClass(StdString("accumulate"), doutput)
+      { /* Ne rien faire de plus */ }
+
+      CAccumulate::CAccumulate(CArray<double,1>& doutput, double missingValue)
+         : SuperClass(StdString("accumulate"), doutput, missingValue)
       { /* Ne rien faire de plus */ }
 
@@ -20 +24 @@
                                  CArray<double,1>& _doutput)
       {
-/*
-         const double * it1  = _dinput->data(),
-                      * end1 = _dinput->data() + _dinput->num_elements(); 
-               double * it   = _doutput->data();
-         if (this->nbcall == 1)
-              for (; it1 != end1; it1++, it++) *it  = *it1;
-         else for (; it1 != end1; it1++, it++) *it += *it1;               
-*/
         if (this->nbcall == 1) _doutput=_dinput ;
-        else _doutput+=_dinput ;
+        else 
+        {
+          if (hasMissingValue)
+          {
+            int i, n =_dinput.numElements() ;
+            const double * in=_dinput.dataFirst() ;
+            double* out=_doutput.dataFirst();
+            for (i=0; i<n; ++i,++in,++out) 
+              if (*in!=missingValue)
+              {
+                if(*out!=missingValue) *out  += *in;
+                else *out=*in ;
+              }
+          }
+          else _doutput+=_dinput ;
+        }
+      }
       
-      }
       
       void CAccumulate::final(void)
       {
-/*          double * it1  = this->getDataOutput()->data(),
-                 * end1 = this->getDataOutput()->data() + this->getDataOutput()->num_elements();
-          for (; it1 != end1; it1++) *it1 /= this->nbcall;
-          this->nbcall = 0;                                                   
-*/
-//        doutput/=this->nbcall; 
         this->nbcall = 0; 
       }