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

XIOS/trunk/src/functor/maximum.cpp

@@ -14 +14 @@
       { /* Ne rien faire de plus */ }
 
+      CMaximum::CMaximum(CArray<double,1>& doutput, double missingValue)
+         : SuperClass(StdString("maximum"), doutput, missingValue)
+      { /* Ne rien faire de plus */ }
+
       CMaximum::~CMaximum(void)
       { /* Ne rien faire de plus */ }
@@ -26 +30 @@
               double * it   = _doutput.dataFirst();
          if (this->nbcall == 1) for (; it1 != end1; it1++, it++) *it = *it1;
-         else for (; it1 != end1; it1++, it++) *it = std::max(*it1, *it);
+         else 
+         {
+           if (hasMissingValue) 
+           { 
+             for (; it1 != end1; it1++, it++) 
+               if (*it1 != missingValue)
+               {
+                 if ( *it != missingValue) *it = std::max(*it1, *it);
+                 else *it=*it1 ;  
+               }
+           }
+           else for (; it1 != end1; it1++, it++) *it = std::max(*it1, *it);
+         }