Changeset 1999 for XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_reduce_axis.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_reduce_axis.cpp (modified) (3 diffs)

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

@@ -12 +12 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-#include "reduction.hpp"
+
 
 namespace xios {
@@ -47 +47 @@
 
 CAxisAlgorithmReduceAxis::CAxisAlgorithmReduceAxis(bool isSource, CAxis* axisDestination, CAxis* axisSource, CReduceAxisToAxis* algo)
- : CAxisAlgorithmTransformation(isSource, axisDestination, axisSource), reduction_(0)
+ : CAlgorithmTransformationReduce(isSource)
 TRY
 {
   eliminateRedondantSrc_= false ;
   algo->checkValid(axisDestination, axisSource);
-  StdString op;
+
   switch (algo->operation)
   {
     case CReduceAxisToAxis::operation_attr::sum:
-      op = "sum";
+      operator_ = EReduction::sum;
       break;
     case CReduceAxisToAxis::operation_attr::min:
-      op = "min";
+      operator_ = EReduction::min;
       break;
     case CReduceAxisToAxis::operation_attr::max:
-      op = "max";
+      operator_ = EReduction::max;
       break;
     case CReduceAxisToAxis::operation_attr::average:
-      op = "average";
+      operator_ = EReduction::average;
       break;
     default:
@@ -73 +73 @@
          << "Axis destination " << axisDestination->getId());
 
+    TransformationIndexMap& transMap = this->transformationMapping_;
+    CArray<int,1>& axisDstIndex = axisDestination->index;
+    int nbAxisIdx = axisDstIndex.numElements();
+    for (int idxAxis = 0; idxAxis < nbAxisIdx; ++idxAxis)
+    {
+      int globalAxisIdx = axisDstIndex(idxAxis);
+      transMap[globalAxisIdx].resize(1);
+      transMap[globalAxisIdx][0]=globalAxisIdx ;      
+    }
+
   }
-
-  reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
+ 
+  axisDestination->checkAttributes() ;
+  this->computeAlgorithm(axisSource->getLocalView(CElementView::WORKFLOW), axisDestination->getLocalView(CElementView::WORKFLOW)) ;
 }
 CATCH
 
-void CAxisAlgorithmReduceAxis::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
-
-void CAxisAlgorithmReduceAxis::updateData(CArray<double,1>& dataOut)
-TRY
-{
-  reduction_->updateData(dataOut);
-}
-CATCH
 
 CAxisAlgorithmReduceAxis::~CAxisAlgorithmReduceAxis()
 TRY
 {
-  if (0 != reduction_) delete reduction_;
+ 
 }
 CATCH
 
-void CAxisAlgorithmReduceAxis::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];
-  CArray<int,1>& axisDstIndex = axisDest_->index;
-  int nbAxisIdx = axisDstIndex.numElements();
-  for (int idxAxis = 0; idxAxis < nbAxisIdx; ++idxAxis)
-  {
-    int globalAxisIdx = axisDstIndex(idxAxis);
-    transMap[globalAxisIdx].resize(1);
-    transWeight[globalAxisIdx].resize(1);
-    transMap[globalAxisIdx][0]=globalAxisIdx ;      
-    transWeight[globalAxisIdx][0] = 1.0 ;      
-  }
-}
-CATCH
 
 }