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

Timestamp:

01/03/21 18:00:43 (3 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_extract_domain.cpp (modified) (4 diffs)

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

@@ -48 +48 @@
 
 CAxisAlgorithmExtractDomain::CAxisAlgorithmExtractDomain(bool isSource, CAxis* axisDestination, CDomain* domainSource, CExtractDomainToAxis* algo)
- : CAxisAlgorithmTransformation(isSource, axisDestination, domainSource), pos_(-1), reduction_(0)
+ : CAlgorithmTransformationTransfer(isSource), pos_(-1), axisDest_(axisDestination), domainSrc_(domainSource)
 TRY
 {
@@ -67 +67 @@
 
   pos_ = algo->position;
-  reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
-}
-CATCH
 
-void CAxisAlgorithmExtractDomain::apply(const std::vector<std::pair<int,double> >& localIndex,
-                                        const double* dataInput,
-                                        CArray<double,1>& dataOut,
-                                        std::vector<bool>& flagInitial,                     
-                                        bool ignoreMissingValue, bool firstPass)
-TRY
-{
-  reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue, firstPass);
-}
-CATCH
-
-CAxisAlgorithmExtractDomain::~CAxisAlgorithmExtractDomain()
-TRY
-{
-  if (0 != reduction_) delete reduction_;
-}
-CATCH
-
-void CAxisAlgorithmExtractDomain::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];
+  auto& transMap = this->transformationMapping_;
 
   CArray<int,1>& axisDstIndex = axisDest_->index;
@@ -106 +78 @@
     {
       int globalAxisIdx = axisDstIndex(idxAxis);
-      transMap[globalAxisIdx].resize(1);
-      transWeight[globalAxisIdx].resize(1);
-      transMap[globalAxisIdx][0] = globalAxisIdx * ni_glo + pos_;
-      transWeight[globalAxisIdx][0] = 1.0;
-
+      transMap[globalAxisIdx] = globalAxisIdx * ni_glo + pos_;
     }
   }
@@ -119 +87 @@
     {
       int globalAxisIdx = axisDstIndex(idxAxis);
-      transMap[globalAxisIdx].resize(1);
-      transWeight[globalAxisIdx].resize(1);
-      transMap[globalAxisIdx][0] = globalAxisIdx + ni_glo * pos_;
-      transWeight[globalAxisIdx][0] = 1.0;
+      transMap[globalAxisIdx] = globalAxisIdx + ni_glo * pos_;
     }
   }
   else
   {}
+
+  axisDestination->checkAttributes() ;
+  this->computeAlgorithm(domainSource->getLocalView(CElementView::WORKFLOW), axisDestination->getLocalView(CElementView::WORKFLOW)) ;
 }
 CATCH
+
+
+CAxisAlgorithmExtractDomain::~CAxisAlgorithmExtractDomain()
+TRY
+{
 }
+CATCH
+
+}