Changeset 1261 for XIOS/trunk/src/transformation/Functions/max_reduction.cpp

Timestamp:

09/12/17 09:45:29 (7 years ago)

Author:

ymipsl

Message:

backport of rev1260 in trunk.

YM

File:

• XIOS/trunk/src/transformation/Functions/max_reduction.cpp (modified) (2 diffs)

XIOS/trunk/src/transformation/Functions/max_reduction.cpp

@@ -31 +31 @@
                                    CArray<double,1>& dataOut,
                                    std::vector<bool>& flagInitial,
-                                   bool ignoreMissingValue)
+                                   bool ignoreMissingValue, bool firstPass)
 { 
   if (ignoreMissingValue)
   {
     int nbLocalIndex = localIndex.size();
-    int currentlocalIndex = 0;    
+    int currentlocalIndex = 0;
+    if (firstPass) dataOut=std::numeric_limits<double>::quiet_NaN();    
     for (int idx = 0; idx < nbLocalIndex; ++idx)
     {
@@ -51 +52 @@
           dataOut(currentlocalIndex) = std::max(*(dataInput + idx), dataOut(currentlocalIndex));
         }
-      }
-      else
-      {
-        if (flagInitial[currentlocalIndex]) 
-          dataOut(currentlocalIndex) = std::numeric_limits<double>::quiet_NaN();
       }
     }