Changeset 912

Timestamp:

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

Author:

mhnguyen

Message:

Fixing bug in axis interpolation

+) Correct index for searching interpolant values

Test
+) On local
+) Ok

Location:

XIOS/trunk/src/transformation

Files:

• axis_algorithm_interpolate.cpp (modified) (3 diffs)
• axis_algorithm_interpolate.hpp (modified) (1 diff)

XIOS/trunk/src/transformation/axis_algorithm_interpolate.cpp

@@ -54 +54 @@
     XIOSAlgorithms::sortWithIndex<double, CVectorStorage>(recvBuff, indexVec);
     for (int i = 0; i < srcSize; ++i) valueSrc[i] = recvBuff[indexVec[i]];
-    computeInterpolantPoint(valueSrc, idx);
+    computeInterpolantPoint(valueSrc, indexVec, idx);
   }
 }
@@ -64 +64 @@
   \param [in] tranPos position of axis on a domain
 */
-void CAxisAlgorithmInterpolate::computeInterpolantPoint(const std::vector<double>& axisValue, int transPos)
+void CAxisAlgorithmInterpolate::computeInterpolantPoint(const std::vector<double>& axisValue,
+                                                        const std::vector<int>& indexVec,
+                                                        int transPos)
 {
   std::vector<double>::const_iterator itb = axisValue.begin(), ite = axisValue.end();
@@ -117 +119 @@
     {
       int index = std::distance(itb, it);
-      interpolatingIndexValues[idx+ibegin].push_back(make_pair(index,*it));
+      interpolatingIndexValues[idx+ibegin].push_back(make_pair(indexVec[index],*it));
     }
   }

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, int transPos = 0);
+  void computeInterpolantPoint(const std::vector<double>& recvBuff, const std::vector<int>&, 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,