Changeset 827 for XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

Timestamp:

03/23/16 16:10:45 (8 years ago)

Author:

mhnguyen

Message:

Implementing dynamic interpolation on axis

+) Change grid transformation to make it more flexible
+) Make some small improvements

Test
+) On Curie
+) All test pass

File:

• XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp (modified) (4 diffs)

XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

@@ -23 +23 @@
 {
   interpDomain_->checkValid(domainSource);
-  computeIndexSourceMapping();
+//  computeIndexSourceMapping();
 }
 
@@ -351 +351 @@
   Compute the index mapping between domain on grid source and one on grid destination
 */
-void CDomainAlgorithmInterpolate::computeIndexSourceMapping()
+void CDomainAlgorithmInterpolate::computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs)
 {
   if (!interpDomain_->file.isEmpty())
@@ -381 +381 @@
   CContextClient* client=context->client;
   int clientRank = client->clientRank;
+
+  this->transformationMapping_.resize(1);
+  this->transformationWeight_.resize(1);
+
+  std::map<int, std::vector<int> >& transMap = this->transformationMapping_[0];
+  std::map<int, std::vector<double> >& transWeight = this->transformationWeight_[0];
 
   boost::unordered_map<size_t,int> globalIndexOfDomainDest;
@@ -531 +537 @@
     for (int idx = 0; idx < countBuff; ++idx)
     {
-      transformationMapping_[*(recvIndexDestBuff + receivedSize + idx)].push_back(*(recvIndexSrcBuff + receivedSize + idx));
-      transformationWeight_[*(recvIndexDestBuff + receivedSize + idx)].push_back(*(recvWeightBuff + receivedSize + idx));
+      transMap[*(recvIndexDestBuff + receivedSize + idx)].push_back(*(recvIndexSrcBuff + receivedSize + idx));
+      transWeight[*(recvIndexDestBuff + receivedSize + idx)].push_back(*(recvWeightBuff + receivedSize + idx));
     }
     receivedSize += countBuff;