Changeset 1158 for XIOS/dev/dev_olga/src/transformation/Functions/average_reduction.cpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

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

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

@@ -3 +3 @@
    \author Ha NGUYEN
    \since 8 Sep 2016
-   \date 8 Sep 2016
+   \date 9 Jan 2017
 
    \brief average reduction
  */
 #include "average_reduction.hpp"
+#include "utils.hpp"
 
 namespace xios {
@@ -29 +30 @@
                                        const double* dataInput,
                                        CArray<double,1>& dataOut,
-                                       std::vector<bool>& flagInitial)
+                                       std::vector<bool>& flagInitial,                     
+                                       bool ignoreMissingValue)
 {
-  if (resetWeight_) { weights_.resize(flagInitial.size()); weights_ = 1.0; resetWeight_ = false; }
+  if (resetWeight_) { weights_.resize(flagInitial.size()); weights_ = 1.0; resetWeight_ = false; }  
 
-  int nbLocalIndex = localIndex.size();
-  int currentlocalIndex = 0;
-  double currentWeight  = 0.0;
-  for (int idx = 0; idx < nbLocalIndex; ++idx)
+  if (ignoreMissingValue)
   {
-    currentlocalIndex = localIndex[idx].first;
-    currentWeight     = localIndex[idx].second;
+    int nbLocalIndex = localIndex.size();
+    int currentlocalIndex = 0;
+    double currentWeight  = 0.0;
 
-    if (flagInitial[currentlocalIndex])
+    dataOut=std::numeric_limits<double>::quiet_NaN();
+
+    for (int idx = 0; idx < nbLocalIndex; ++idx)
     {
-      dataOut(currentlocalIndex) = *(dataInput + idx);
-      flagInitial[currentlocalIndex] = false;
+      currentlocalIndex = localIndex[idx].first;
+      currentWeight     = localIndex[idx].second;
+      if (!NumTraits<double>::isnan(*(dataInput + idx)))
+      {
+        if (flagInitial[currentlocalIndex])
+        {
+          dataOut(currentlocalIndex) = *(dataInput + idx);
+          flagInitial[currentlocalIndex] = false;
+        }
+        else
+        {
+          dataOut(currentlocalIndex)  += *(dataInput + idx);
+          weights_(currentlocalIndex) += 1.0;
+        }
+      }
     }
-    else
+  }
+  else
+  {
+    int nbLocalIndex = localIndex.size();
+    int currentlocalIndex = 0;
+    double currentWeight  = 0.0;
+    for (int idx = 0; idx < nbLocalIndex; ++idx)
     {
-      dataOut(currentlocalIndex)  += *(dataInput + idx);
-      weights_(currentlocalIndex) += 1.0;
+      currentlocalIndex = localIndex[idx].first;
+      currentWeight     = localIndex[idx].second;
+
+      if (flagInitial[currentlocalIndex])
+      {
+        dataOut(currentlocalIndex) = *(dataInput + idx);
+        flagInitial[currentlocalIndex] = false;
+      }
+      else
+      {
+        dataOut(currentlocalIndex)  += *(dataInput + idx);
+        weights_(currentlocalIndex) += 1.0;
+      }
     }
   }