Changeset 896

Timestamp:

07/11/16 17:36:08 (8 years ago)

Author:

mhnguyen

Message:

Correcting a bug in axis interpolation

+) Ascending or Descending values of source axis wont affect on the results

Test
+) On Curie
+) Test is correct

Location:

XIOS/trunk/src/transformation

Files:

• axis_algorithm_interpolate.cpp (modified) (4 diffs)
• axis_algorithm_interpolate.hpp (modified) (2 diffs)

XIOS/trunk/src/transformation/axis_algorithm_interpolate.cpp

@@ -44 +44 @@
   // Fill in axis value from coordinate
   fillInAxisValue(vecAxisValue, dataAuxInputs);
+  std::vector<double> valueSrc(srcSize);
+  std::vector<double> recvBuff(srcSize);
+  std::vector<int> indexVec(srcSize);
 
   for (int idx = 0; idx < vecAxisValue.size(); ++idx)
   {
     CArray<double,1>& axisValue = vecAxisValue[idx];
-    std::vector<double> recvBuff(srcSize);
-    std::vector<int> indexVec(srcSize);
     retrieveAllAxisValue(axisValue, axisMask, recvBuff, indexVec);
     XIOSAlgorithms::sortWithIndex<double, CVectorStorage>(recvBuff, indexVec);
-    computeInterpolantPoint(recvBuff, indexVec, idx);
+    for (int i = 0; i < srcSize; ++i) valueSrc[i] = recvBuff[indexVec[i]];
+    computeInterpolantPoint(valueSrc, idx);
   }
 }
@@ -60 +62 @@
   Assume that we have all value of axis source, with these values, need to calculate weight (coeff) of Lagrange polynomial
   \param [in] axisValue all value of axis source
-  \param [in] indexVec permutation index of axisValue
-*/
-void CAxisAlgorithmInterpolate::computeInterpolantPoint(const std::vector<double>& axisValue, const std::vector<int>& indexVec, int transPos)
+  \param [in] tranPos position of axis on a domain
+*/
+void CAxisAlgorithmInterpolate::computeInterpolantPoint(const std::vector<double>& axisValue, int transPos)
 {
   std::vector<double>::const_iterator itb = axisValue.begin(), ite = axisValue.end();
   std::vector<double>::const_iterator itLowerBound, itUpperBound, it;
-  std::vector<int>::const_iterator itbVec = indexVec.begin(), itVec;
   const double sfmax = NumTraits<double>::sfmax();
 
@@ -116 +117 @@
     {
       int index = std::distance(itb, it);
-      interpolatingIndexValues[idx+ibegin].push_back(make_pair(indexVec[index],*it));
+      interpolatingIndexValues[idx+ibegin].push_back(make_pair(index,*it));
     }
   }
@@ -186 +187 @@
         indexVec[idx] = idx;
       }
-      else recvBuff[idx] = NumTraits<double>::sfmax();
+      else
+      {
+        recvBuff[idx] = NumTraits<double>::sfmax();
+        indexVec[idx] = -1;
+      }
     }
 

XIOS/trunk/src/transformation/axis_algorithm_interpolate.hpp

@@ -33 +33 @@
   void retrieveAllAxisValue(const CArray<double,1>& axisValue, const CArray<bool,1>& axisMask,
                             std::vector<double>& recvBuff, std::vector<int>& indexVec);
-  void computeInterpolantPoint(const std::vector<double>& recvBuff, const std::vector<int>& indexVec, int transPos = 0);
+  void computeInterpolantPoint(const std::vector<double>& recvBuff, int transPos = 0);
   void computeWeightedValueAndMapping(const std::map<int, std::vector<std::pair<int,double> > >& interpolatingIndexValues, int transPos = 0);
   void fillInAxisValue(std::vector<CArray<double,1> >& vecAxisValue,
@@ -46 +46 @@
 
 }
+
 #endif // __XIOS_AXIS_ALGORITHM_INTERPOLATE_HPP__