Changeset 1999 for XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_inverse.cpp

Timestamp:

01/03/21 18:00:43 (4 years ago)

Author:

ymipsl

Message:

Adapt transformation algorithm to new infrastructure (on going...)

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_inverse.cpp (modified) (4 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_inverse.cpp

@@ -49 +49 @@
 
 CAxisAlgorithmInverse::CAxisAlgorithmInverse(bool isSource, CAxis* axisDestination, CAxis* axisSource, CInverseAxis* inverseAxis)
- : CAxisAlgorithmTransformation(isSource, axisDestination, axisSource)
+ : CAlgorithmTransformationTransfer(isSource), axisDest_(axisDestination), axisSrc_(axisSource)
 TRY
 {
@@ -59 +59 @@
            << "Size of axis destination " <<axisDestination->getId() << " is " << axisDestination->n_glo.getValue());
   }
-}
-CATCH
-
-void CAxisAlgorithmInverse::computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs)
-TRY
-{
-  this->transformationMapping_.resize(1);
-  this->transformationWeight_.resize(1);
-
-  TransformationIndexMap& transMap = this->transformationMapping_[0];
-  TransformationWeightMap& transWeight = this->transformationWeight_[0];
-
-  int globalIndexSize = axisDestGlobalIndex_.size();
+
+  auto& transMap = this->transformationMapping_;
+
+  int globalIndexSize = axisDestination->index.size();
   for (int idx = 0; idx < globalIndexSize; ++idx)
   {
-    transMap[axisDestGlobalIndex_[idx]].push_back(axisDestGlobalSize_-axisDestGlobalIndex_[idx]-1);
-    transWeight[axisDestGlobalIndex_[idx]].push_back(1.0);
+    transMap[axisDestination->index(idx)] = globalIndexSize-axisDestination->index(idx)-1;
   }
 
@@ -88 +78 @@
     }
   }
-}
-CATCH
+
+  axisDestination->checkAttributes() ;
+  this->computeAlgorithm(axisSource->getLocalView(CElementView::WORKFLOW), axisDestination->getLocalView(CElementView::WORKFLOW)) ;
+
+}
+CATCH
+
 
 /*!
@@ -118 +113 @@
   typedef std::unordered_map<size_t, std::vector<double> > GlobalIndexMapFromSrcToDest;
   GlobalIndexMapFromSrcToDest globalIndexMapFromSrcToDest;
-  TransformationIndexMap& transMap = this->transformationMapping_[0];
-  TransformationIndexMap::const_iterator itb = transMap.begin(), ite = transMap.end(), it;
+  auto& transMap = this->transformationMapping_;
   CArray<size_t,1> globalSrcIndex(transMap.size());
   int localIndex = 0;
-  for (it = itb; it != ite; ++it)
-  {
-    size_t srcIndex = it->second[0];
+  for (auto it = transMap.begin(); it != transMap.end(); ++it)
+  {
+    size_t srcIndex = it->second;
     globalIndexMapFromSrcToDest[srcIndex].resize(1);
     globalIndexMapFromSrcToDest[srcIndex][0] = it->first;