Changeset 1158 for XIOS/dev/dev_olga/src/transformation/Functions/max_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/max_reduction.cpp (modified) (2 diffs)

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

@@ -8 +8 @@
  */
 #include "max_reduction.hpp"
+#include "utils.hpp"
 
 namespace xios {
@@ -29 +30 @@
                                    const double* dataInput,
                                    CArray<double,1>& dataOut,
-                                   std::vector<bool>& flagInitial)
-{
-  int nbLocalIndex = localIndex.size();
-  int currentlocalIndex = 0;
-  double currentWeight  = 0.0;
-  for (int idx = 0; idx < nbLocalIndex; ++idx)
+                                   std::vector<bool>& flagInitial,
+                                   bool ignoreMissingValue)
+{ 
+  if (ignoreMissingValue)
   {
-    currentlocalIndex = localIndex[idx].first;
-    currentWeight     = localIndex[idx].second;
-    if (flagInitial[currentlocalIndex])
+    int nbLocalIndex = localIndex.size();
+    int currentlocalIndex = 0;
+    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;      
+      if (!NumTraits<double>::isnan(*(dataInput + idx)))
+      {
+        if (flagInitial[currentlocalIndex])
+        {
+          dataOut(currentlocalIndex) = *(dataInput + idx);
+          flagInitial[currentlocalIndex] = false;
+        }
+        else
+        {
+          dataOut(currentlocalIndex) = std::max(*(dataInput + idx), dataOut(currentlocalIndex));
+        }
+      }
     }
-    else
+  }
+  else
+  {
+    int nbLocalIndex = localIndex.size();
+    int currentlocalIndex = 0;    
+    for (int idx = 0; idx < nbLocalIndex; ++idx)
     {
-      dataOut(currentlocalIndex) = std::max(*(dataInput + idx), dataOut(currentlocalIndex));
+      currentlocalIndex = localIndex[idx].first;      
+      if (flagInitial[currentlocalIndex])
+      {
+        dataOut(currentlocalIndex) = *(dataInput + idx);
+        flagInitial[currentlocalIndex] = false;
+      }
+      else
+      {
+        dataOut(currentlocalIndex) = std::max(*(dataInput + idx), dataOut(currentlocalIndex));
+      }
     }
   }