Changeset 827 for XIOS/trunk/src/transformation/domain_algorithm_zoom.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_zoom.cpp (modified) (4 diffs)

XIOS/trunk/src/transformation/domain_algorithm_zoom.cpp

@@ -40 +40 @@
   }
 
-  computeIndexSourceMapping();
+//  computeIndexSourceMapping();
 }
 
@@ -46 +46 @@
   Compute the index mapping between domain on grid source and one on grid destination
 */
-void CDomainAlgorithmZoom::computeIndexSourceMapping()
+void CDomainAlgorithmZoom::computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs)
 {
   int niSource = domainSrc_->ni.getValue();
@@ -68 +68 @@
   int niGlob = domainSrc_->ni_glo.getValue();
   int njGlob = domainSrc_->nj_glo.getValue();
-  std::map<int, std::vector<int> >& transMap = this->transformationMapping_;
-  std::map<int, std::vector<double> >& transWeight = this->transformationWeight_;
+
+  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];
+
+//  std::map<int, std::vector<int> >& transMap = this->transformationMapping_;
+//  std::map<int, std::vector<double> >& transWeight = this->transformationWeight_;
   int domainGlobalIndex;
   for (int j = 0; j < nj; ++j)
@@ -110 +117 @@
   int globalIndexMask = 0;
 
-  std::map<int, std::vector<int> >& transMap = this->transformationMapping_;
+  std::map<int, std::vector<int> >& transMap = this->transformationMapping_[0];
   std::map<int, std::vector<int> >::const_iterator ite = (transMap).end();
   for (int j = 0; j < njMask; ++j)