Changeset 1205 for XIOS/dev/branch_yushan_merged/src/transformation/Functions/average_reduction.cpp

Timestamp:

07/10/17 18:17:04 (7 years ago)

Author:

yushan

Message:

branch merged with trunk @1200

File:

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

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

@@ -39 +39 @@
     int nbLocalIndex = localIndex.size();
     int currentlocalIndex = 0;
-    double currentWeight  = 0.0;
-
-    dataOut=std::numeric_limits<double>::quiet_NaN();
+    double currentWeight  = 0.0;    
 
     for (int idx = 0; idx < nbLocalIndex; ++idx)
@@ -59 +57 @@
           weights_(currentlocalIndex) += 1.0;
         }
+      }
+      else
+      {
+        if (flagInitial[currentlocalIndex]) 
+          dataOut(currentlocalIndex) = std::numeric_limits<double>::quiet_NaN();
       }
     }