Changeset 913 for XIOS

Timestamp:

08/03/16 15:49:11 (8 years ago)

Author:

mhnguyen

Message:

Adding the mask checking for dynamic vertical interpolation

+) Only use the non-masked of domain on which interpolating field is.

Test
+) On local
+) Ok, missing value on masked points

File:

• XIOS/trunk/src/transformation/axis_algorithm_interpolate.cpp (modified) (2 diffs)

XIOS/trunk/src/transformation/axis_algorithm_interpolate.cpp

@@ -272 +272 @@
     CDomain* dom = domListP[0];
     size_t vecAxisValueSize = dom->i_index.numElements();
+    size_t vecAxisValueSizeWithMask = 0;
+    for (size_t idx = 0; idx < vecAxisValueSize; ++idx)
+    {
+      if (dom->mask_1d(idx)) ++vecAxisValueSizeWithMask;
+    }
+
     int niGlobDom = dom->ni_glo.getValue();
-    vecAxisValue.resize(vecAxisValueSize);
+    vecAxisValue.resize(vecAxisValueSizeWithMask);
     if (transPosition_.empty())
     {
-      transPosition_.resize(vecAxisValueSize);
+      size_t indexMask = 0;
+      transPosition_.resize(vecAxisValueSizeWithMask);
       for (size_t idx = 0; idx < vecAxisValueSize; ++idx)
       {
-        transPosition_[idx].resize(1);
-        transPosition_[idx][0] = (dom->i_index)(idx) + niGlobDom * (dom->j_index)(idx);
-      }
-    }
-    this->transformationMapping_.resize(vecAxisValueSize);
-    this->transformationWeight_.resize(vecAxisValueSize);
-    this->transformationPosition_.resize(vecAxisValueSize);
+        if (dom->mask_1d(idx))
+        {
+          transPosition_[indexMask].resize(1);
+          transPosition_[indexMask][0] = (dom->i_index)(idx) + niGlobDom * (dom->j_index)(idx);
+          ++indexMask;
+        }
+
+      }
+    }
+    this->transformationMapping_.resize(vecAxisValueSizeWithMask);
+    this->transformationWeight_.resize(vecAxisValueSizeWithMask);
+    this->transformationPosition_.resize(vecAxisValueSizeWithMask);
 
     const CDistributionClient::GlobalLocalDataMap& globalLocalIndexSendToServer = grid->getDistributionClient()->getGlobalLocalDataSendToServer();
@@ -292 +304 @@
     std::vector<int> globalDimension = grid->getGlobalDimension();
 
+    size_t indexMask = 0;
     for (size_t idx = 0; idx < vecAxisValueSize; ++idx)
     {
-      size_t axisValueSize = 0;
-      for (size_t jdx = 0; jdx < axisSrcSize; ++jdx)
-      {
-        size_t globalIndex = ((dom->i_index)(idx) + (dom->j_index)(idx)*globalDimension[0]) + (axisSrc_->index)(jdx)*globalDimension[0]*globalDimension[1];
-        if (iteIndex != globalLocalIndexSendToServer.find(globalIndex))
-        {
-          ++axisValueSize;
-        }
-      }
-
-      vecAxisValue[idx].resize(axisValueSize);
-      axisValueSize = 0;
-      for (size_t jdx = 0; jdx < axisSrcSize; ++jdx)
-      {
-        size_t globalIndex = ((dom->i_index)(idx) + (dom->j_index)(idx)*globalDimension[0]) + (axisSrc_->index)(jdx)*globalDimension[0]*globalDimension[1];
-        itIndex = globalLocalIndexSendToServer.find(globalIndex);
-        if (iteIndex != itIndex)
-        {
-          vecAxisValue[idx](axisValueSize) = (*dataAuxInputs[0])(itIndex->second);
-          ++axisValueSize;
-        }
-      }
-    }
-  }
-}
-
-}
+      if (dom->mask_1d(idx))
+      {
+        size_t axisValueSize = 0;
+        for (size_t jdx = 0; jdx < axisSrcSize; ++jdx)
+        {
+          size_t globalIndex = ((dom->i_index)(idx) + (dom->j_index)(idx)*globalDimension[0]) + (axisSrc_->index)(jdx)*globalDimension[0]*globalDimension[1];
+          if (iteIndex != globalLocalIndexSendToServer.find(globalIndex))
+          {
+            ++axisValueSize;
+          }
+        }
+
+        vecAxisValue[indexMask].resize(axisValueSize);
+        axisValueSize = 0;
+        for (size_t jdx = 0; jdx < axisSrcSize; ++jdx)
+        {
+          size_t globalIndex = ((dom->i_index)(idx) + (dom->j_index)(idx)*globalDimension[0]) + (axisSrc_->index)(jdx)*globalDimension[0]*globalDimension[1];
+          itIndex = globalLocalIndexSendToServer.find(globalIndex);
+          if (iteIndex != itIndex)
+          {
+            vecAxisValue[indexMask](axisValueSize) = (*dataAuxInputs[0])(itIndex->second);
+            ++axisValueSize;
+          }
+        }
+        ++indexMask;
+      }
+    }
+  }
+}
+
+}