Changeset 918

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

Location:

XIOS/trunk/src

Files:

• filter/spatial_transform_filter.cpp (modified) (1 diff)
• transformation/axis_algorithm_extract_domain.cpp (modified) (1 diff)
• transformation/axis_algorithm_extract_domain.hpp (modified) (1 diff)
• transformation/axis_algorithm_interpolate.cpp (modified) (4 diffs)
• transformation/axis_algorithm_reduce_domain.cpp (modified) (1 diff)
• transformation/axis_algorithm_reduce_domain.hpp (modified) (1 diff)
• transformation/generic_algorithm_transformation.cpp (modified) (1 diff)
• transformation/generic_algorithm_transformation.hpp (modified) (1 diff)
• transformation/scalar_algorithm_reduce_axis.cpp (modified) (1 diff)
• transformation/scalar_algorithm_reduce_axis.hpp (modified) (1 diff)

XIOS/trunk/src/filter/spatial_transform_filter.cpp

@@ -197 +197 @@
         int countSize = itRecv->second.size();
         const std::vector<std::pair<int,double> >& localIndex_p = itRecv->second;
-//        for (int idx = 0; idx < countSize; ++idx)
-//        {
-//          dataCurrentDest(localIndex_p[idx].first) += *(recvBuff+currentBuff+idx) * localIndex_p[idx].second;
-//        }
         (*itAlgo)->apply(localIndex_p,
                          recvBuff+currentBuff,
                          dataCurrentDest,
-                         localInitFlag);
+                         localInitFlag,
+                         defaultValue);
 
         currentBuff += countSize;

XIOS/trunk/src/transformation/axis_algorithm_extract_domain.cpp

@@ -30 +30 @@
                                         const double* dataInput,
                                         CArray<double,1>& dataOut,
-                                        std::vector<bool>& flagInitial)
+                                        std::vector<bool>& flagInitial,
+                                        const double& defaultValue)
 {
   reduction_->apply(localIndex, dataInput, dataOut, flagInitial);

XIOS/trunk/src/transformation/axis_algorithm_extract_domain.hpp

@@ -31 +31 @@
                      const double* dataInput,
                      CArray<double,1>& dataOut,
-                     std::vector<bool>& flagInitial);
+                     std::vector<bool>& flagInitial,
+                     const double& defaultValue);
 
   virtual ~CAxisAlgorithmExtractDomain();

XIOS/trunk/src/transformation/axis_algorithm_interpolate.cpp

@@ -69 +69 @@
 {
   std::vector<double>::const_iterator itb = axisValue.begin(), ite = axisValue.end();
-  std::vector<double>::const_iterator itLowerBound, itUpperBound, it;
+  std::vector<double>::const_iterator itLowerBound, itUpperBound, it, iteRange;
   const double sfmax = NumTraits<double>::sfmax();
 
@@ -79 +79 @@
   for (int idx = 0; idx < numValue; ++idx)
   {
+    bool outOfRange = false;
     double destValue = axisDestValue(idx);
+    if (destValue < *itb) outOfRange = true;
+
     itLowerBound = std::lower_bound(itb, ite, destValue);
     itUpperBound = std::upper_bound(itb, ite, destValue);
     if ((ite != itUpperBound) && (sfmax == *itUpperBound)) itUpperBound = ite;
 
+    if ((ite == itLowerBound) || (ite == itUpperBound)) outOfRange = true;
     // If the value is not in the range, that means we'll do extra-polation
-    if (ite == itLowerBound) // extra-polation
-    {
-      itLowerBound = itb;
-      itUpperBound = itb + order_+1;
-    }
-    else if (ite == itUpperBound) // extra-polation
-    {
-      itLowerBound = itUpperBound - order_-1;
-    }
-    else
-    {
-      if (itb != itLowerBound) --itLowerBound;
-      if (ite != itUpperBound) ++itUpperBound;
+//    if (ite == itLowerBound) // extra-polation
+//    {
+//      itLowerBound = itb;
+//      itUpperBound = itb + order_+1;
+//    }
+//    else if (ite == itUpperBound) // extra-polation
+//    {
+//      itLowerBound = itUpperBound - order_-1;
+//    }
+//else
+    // We don't do extrapolation FOR NOW, maybe in the future
+    if (!outOfRange)
+    {
+      if ((itLowerBound == itUpperBound) && (itb != itLowerBound)) --itLowerBound;
       int order = (order_ + 1) - 2;
       bool down = true;
@@ -114 +119 @@
         }
       }
-    }
-
-    for (it = itLowerBound; it != itUpperBound; ++it)
-    {
-      int index = std::distance(itb, it);
-      interpolatingIndexValues[idx+ibegin].push_back(make_pair(indexVec[index],*it));
+
+
+      iteRange = (ite == itUpperBound) ? itUpperBound : itUpperBound + 1;
+      for (it = itLowerBound; it != iteRange; ++it)
+      {
+        int index = std::distance(itb, it);
+        interpolatingIndexValues[idx+ibegin].push_back(make_pair(indexVec[index],*it));
+      }
     }
   }
@@ -163 +170 @@
     }
   }
+  if (!transPosition_.empty() && this->transformationPosition_[transPos].empty())
+    (this->transformationPosition_[transPos])[0] = transPosition_[transPos];
+
 }
 

XIOS/trunk/src/transformation/axis_algorithm_reduce_domain.cpp

@@ -27 +27 @@
 
 void CAxisAlgorithmReduceDomain::apply(const std::vector<std::pair<int,double> >& localIndex,
-                                         const double* dataInput,
-                                         CArray<double,1>& dataOut,
-                                         std::vector<bool>& flagInitial)
+                                       const double* dataInput,
+                                       CArray<double,1>& dataOut,
+                                       std::vector<bool>& flagInitial,
+                                       const double& defaultValue)
 {
   reduction_->apply(localIndex, dataInput, dataOut, flagInitial);

XIOS/trunk/src/transformation/axis_algorithm_reduce_domain.hpp

@@ -31 +31 @@
                      const double* dataInput,
                      CArray<double,1>& dataOut,
-                     std::vector<bool>& flagInitial);
+                     std::vector<bool>& flagInitial,
+                     const double& defaultValue);
 
   virtual ~CAxisAlgorithmReduceDomain();

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;
+    }
   }
 }

XIOS/trunk/src/transformation/generic_algorithm_transformation.hpp

@@ -63 +63 @@
                      const double* dataInput,
                      CArray<double,1>& dataOut,
-                     std::vector<bool>& flagInitial);
+                     std::vector<bool>& flagInitial,
+                     const double& defaultValue);
 
   std::vector<StdString> getIdAuxInputs();

XIOS/trunk/src/transformation/scalar_algorithm_reduce_axis.cpp

@@ -37 +37 @@
                                          const double* dataInput,
                                          CArray<double,1>& dataOut,
-                                         std::vector<bool>& flagInitial)
+                                         std::vector<bool>& flagInitial,
+                                         const double& defaultValue)
 {
   reduction_->apply(localIndex, dataInput, dataOut, flagInitial);

XIOS/trunk/src/transformation/scalar_algorithm_reduce_axis.hpp

@@ -31 +31 @@
                      const double* dataInput,
                      CArray<double,1>& dataOut,
-                     std::vector<bool>& flagInitial);
+                     std::vector<bool>& flagInitial,
+                     const double& defaultValue);
 
   virtual ~CScalarAlgorithmReduceScalar();