Changeset 1156 for XIOS/dev/branch_yushan_merged/src/transformation/Functions/min_reduction.cpp

Timestamp:

06/06/17 15:52:13 (7 years ago)

Author:

yushan

Message:

branch merged with trunk @1155

File:

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

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

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