Changeset 1037 for XIOS/dev/branch_yushan/src/transformation/Functions/average_reduction.cpp

Timestamp:

01/25/17 16:25:17 (7 years ago)

Author:

yushan

Message:

initialize the branch

File:

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

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

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