Changeset 1160 for XIOS/dev/branch_yushan_merged/src/transformation/Functions/max_reduction.cpp

Timestamp:

06/06/17 19:06:45 (7 years ago)

Author:

yushan

Message:

fix bad commit. Back to R1155 branch not merged

File:

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

XIOS/dev/branch_yushan_merged/src/transformation/Functions/max_reduction.cpp

@@ -37 +37 @@
     int nbLocalIndex = localIndex.size();
     int currentlocalIndex = 0;
-
+    dataOut=std::numeric_limits<double>::quiet_NaN();    
     for (int idx = 0; idx < nbLocalIndex; ++idx)
     {
@@ -52 +52 @@
           dataOut(currentlocalIndex) = std::max(*(dataInput + idx), dataOut(currentlocalIndex));
         }
-      }
-      else
-      {
-        if (flagInitial[currentlocalIndex]) 
-          dataOut(currentlocalIndex) = std::numeric_limits<double>::quiet_NaN();
       }
     }