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

XIOS/trunk/src/functor/average.cpp

@@ -12 +12 @@
       { /* Ne rien faire de plus */ }
 
+      CAverage::CAverage(CArray<double,1>& doutput, double missingValue)
+         : SuperClass(StdString("average"), doutput, missingValue)
+      { /* Ne rien faire de plus */ }
+
       CAverage::~CAverage(void)
       { /* 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 ;
+        if (hasMissingValue)
+        {
+          if (nbcalls.numElements()==0) 
+          {
+             nbcalls.resize(_dinput.numElements()) ;
+             nbcalls=0 ;
+          }
+        }
+        
+        if (this->nbcall == 1) 
+        {
+          _doutput=_dinput ;
+          if (hasMissingValue) 
+          {
+            int i, n =_dinput.numElements() ;
+            const double * in=_dinput.dataFirst() ;
+            int* nc=nbcalls.dataFirst() ;
+            for (i=0; i<n; ++i,++nc) 
+              if (*in!=missingValue) (*nc) ++;
+          }
+        }
+        else
+        {
+          if (hasMissingValue)
+          {
+            int i, n =_dinput.numElements() ;
+            const double * in=_dinput.dataFirst() ;
+            double* out=_doutput.dataFirst();
+            int* nc=nbcalls.dataFirst() ;
+            for (i=0; i<n; ++i,++in,++out,++nc) 
+              if (*in!=missingValue) 
+              {
+                if (*nc != 0) (*out)  += *in;
+                else *out = *in ;
+                (*nc) ++;
+              } 
+          }
+          else _doutput+=_dinput ;
+        }
       
       }
@@ -35 +68 @@
       void CAverage::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; 
+        if (hasMissingValue)
+        {
+          int i, n = nbcalls.numElements() ;
+          double* out= doutput.dataFirst();
+          int* nc=nbcalls.dataFirst() ;
+          for (i=0; i<n; ++i, ++out,++nc) 
+            if (*nc!=0) 
+            {
+              *out  /= *nc;
+              *nc = 0 ;
+            }
+        
+        }  
+        else doutput/=this->nbcall; 
         this->nbcall = 0; 
+
       }
    } // namespace func