Changeset 1980 for XIOS/trunk/src/transformation/axis_algorithm_interpolate.cpp

Timestamp:

11/24/20 11:33:59 (4 years ago)

Author:

yushan

Message:

trunk : axis interpolate can have coordinate source (coordinate_src) and coordinate destination (coordinate_dst), while previous attribute coordinate compatible to source

File:

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

XIOS/trunk/src/transformation/axis_algorithm_interpolate.cpp

@@ -50 +50 @@
 
 CAxisAlgorithmInterpolate::CAxisAlgorithmInterpolate(CAxis* axisDestination, CAxis* axisSource, CInterpolateAxis* interpAxis)
-: CAxisAlgorithmTransformation(axisDestination, axisSource), coordinate_(), transPosition_()
+: CAxisAlgorithmTransformation(axisDestination, axisSource), coordinate_(), coordinateDST_(),transPosition_()
 TRY
 {
   interpAxis->checkValid(axisSource);
   order_ = interpAxis->order.getValue();
+  this->idAuxInputs_.clear();
   if (!interpAxis->coordinate.isEmpty())
   {
@@ -61 +62 @@
     this->idAuxInputs_[0] = coordinate_;
   }
+  else if (!interpAxis->coordinate_src.isEmpty())
+  {
+    coordinate_ = interpAxis->coordinate_src.getValue();
+    this->idAuxInputs_.resize(1);
+    this->idAuxInputs_[0] = coordinate_;
+  }
+  if (!interpAxis->coordinate_dst.isEmpty())
+  {
+    coordinateDST_ = interpAxis->coordinate_dst.getValue();
+    this->idAuxInputs_.resize(this->idAuxInputs_.size()+1);
+    this->idAuxInputs_[this->idAuxInputs_.size()-1] = coordinateDST_;
+  }
+  
+
 }
 CATCH
@@ -71 +86 @@
 {
   CTimer::get("CAxisAlgorithmInterpolate::computeIndexSourceMapping_").resume() ;
-  CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int nbClient = client->clientSize;
+  
   CArray<bool,1>& axisMask = axisSrc_->mask;
   int srcSize  = axisSrc_->n_glo.getValue();
@@ -90 +103 @@
     XIOSAlgorithms::sortWithIndex<double, CVectorStorage>(recvBuff, indexVec);
     for (int i = 0; i < srcSize; ++i) valueSrc[i] = recvBuff[indexVec[i]];
-    computeInterpolantPoint(valueSrc, indexVec, idx);
+    computeInterpolantPoint(valueSrc, indexVec, dataAuxInputs, idx);
   }
   CTimer::get("CAxisAlgorithmInterpolate::computeIndexSourceMapping_").suspend() ;
@@ -97 +110 @@
 
 /*!
-  Compute the interpolant points
+  Compute the interpolant points 
   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] dataAuxInputs data for setting values of axis destination
   \param [in] tranPos position of axis on a domain
 */
 void CAxisAlgorithmInterpolate::computeInterpolantPoint(const std::vector<double>& axisValue,
                                                         const std::vector<int>& indexVec,
+                                                        const std::vector<CArray<double,1>* >& dataAuxInputs,
                                                         int transPos)
 TRY
@@ -115 +130 @@
   CArray<double,1>& axisDestValue = axisDest_->value;
   int numValue = axisDestValue.numElements();
+  if(!coordinateDST_.empty())
+  {
+    int nDomPoint = (*dataAuxInputs[0]).numElements()/numValue ;
+    int dst_position_in_data = dataAuxInputs.size()-1;
+    for(int ii=0; ii<numValue; ii++)
+    {
+      axisDestValue(ii) = (*dataAuxInputs[dst_position_in_data])(ii*nDomPoint+transPos);
+    }
+  }
+  
   std::map<int, std::vector<std::pair<int,double> > > interpolatingIndexValues;
 
@@ -172 +197 @@
 CATCH
 
+
+
 /*!
   Compute weight (coeff) of Lagrange's polynomial
@@ -233 +260 @@
   int numValue = axisValue.numElements();
 
+
   if (srcSize == numValue)  // Only one client or axis not distributed
   {
@@ -248 +276 @@
       }
     }
-
   }
   else // Axis distributed
@@ -304 +331 @@
 TRY
 {
-  if (coordinate_.empty())
+  bool has_src = !coordinate_.empty();
+  bool has_dst = !coordinateDST_.empty();
+  
+  int nb_inputs=dataAuxInputs.size();
+  
+  
+  if (!has_src)
   {
     vecAxisValue.resize(1);
@@ -312 +345 @@
     this->transformationWeight_.resize(1);
   }
-  else
+  else 
   {
     CField* field = CField::get(coordinate_);