Changeset 918 for XIOS/trunk/src/transformation/generic_algorithm_transformation.cpp

Timestamp:

08/12/16 19:57:50 (8 years ago)

Author:

mhnguyen

Message:

Modifying vertical interpolation

+) Only process interpolation, the extrapolation will be ignored (value will be unidentified (masked))
+) Make sure even unidenfitified from one transformation can be known in the next transformation

Test
+) On Curie
+) Vertical interpolation: Correct
+) Vertical interpolation + horizontal interpolation: Correct

File:

• XIOS/trunk/src/transformation/generic_algorithm_transformation.cpp (modified) (1 diff)

XIOS/trunk/src/transformation/generic_algorithm_transformation.cpp

@@ -22 +22 @@
                                             const double* dataInput,
                                             CArray<double,1>& dataOut,
-                                            std::vector<bool>& flagInitial)
+                                            std::vector<bool>& flagInitial,
+                                            const double& defaultValue)
 {
   int nbLocalIndex = localIndex.size();
-  for (int idx = 0; idx < nbLocalIndex; ++idx)
-  {
-    dataOut(localIndex[idx].first) += *(dataInput + idx) * localIndex[idx].second;
+  bool hasMissingValue = (0.0 != defaultValue) ? true : false;
+  if (hasMissingValue)
+  {
+    for (int idx = 0; idx < nbLocalIndex; ++idx)
+    {
+      if (defaultValue == *(dataInput + idx))
+      {
+        flagInitial[localIndex[idx].first] = false;
+      }
+      else
+      {
+        dataOut(localIndex[idx].first) += *(dataInput + idx) * localIndex[idx].second;
+      }
+    }
+
+    for (int idx = 0; idx < nbLocalIndex; ++idx)
+    {
+      if (!flagInitial[localIndex[idx].first])
+        dataOut(localIndex[idx].first) = defaultValue;
+    }
+  }
+  else
+  {
+    for (int idx = 0; idx < nbLocalIndex; ++idx)
+    {
+      dataOut(localIndex[idx].first) += *(dataInput + idx) * localIndex[idx].second;
+    }
   }
 }