Changeset 2291 for XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_reduce_axis.cpp

Timestamp:

02/01/22 15:28:48 (2 years ago)

Author:

ymipsl

Message:

Improve reduction transformation

• make the difference between reduction over geometry or reduction between process.

• geometrical reduction :

domain -> axis
axis -> scalar
domain -> scalar

• reduction across processes for redondant geometrical cell :

axis -> axis
scalar -> scalar

Reduction can be local (only for the geometrical cell owned by current process) or global, using the "local" attribute (bool) over the reduction.

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 "grid_algorithm_reduce.hpp"
 
 
@@ -50 +51 @@
 TRY
 {
-  eliminateRedondantSrc_= false ;
+  if (!axisDestination->checkGeometricAttributes(false))
+  {
+    axisDestination->resetGeometricAttributes();
+    axisDestination->setGeometricAttributes(*axisSource) ;
+  }
+  axisDestination->checkAttributes() ; 
   algo->checkValid(axisDestination, axisSource);
-  axisDestination->checkAttributes() ;
+  
 
   switch (algo->operation)
@@ -75 +81 @@
   }
 
-  TransformationIndexMap& transMap = this->transformationMapping_;
-  CArray<int,1>& axisDstIndex = axisDestination->index;
-  int nbAxisIdx = axisDstIndex.numElements();
-  for (int idxAxis = 0; idxAxis < nbAxisIdx; ++idxAxis)
+  //TransformationIndexMap& transMap = this->transformationMapping_;
+  //CArray<int,1>& axisDstIndex = axisDestination->index;
+  //int nbAxisIdx = axisDstIndex.numElements();
+
+
+
+  auto& transMap = this->transformationMapping_;
+  
+  CArray<size_t,1> dstGlobalIndex ;
+  axisDestination->getLocalView(CElementView::WORKFLOW)->getGlobalIndexView(dstGlobalIndex) ;
+  size_t nbIdx = dstGlobalIndex.numElements();
+
+  for (size_t idx = 0; idx < nbIdx; ++idx)
   {
-    int globalAxisIdx = axisDstIndex(idxAxis);
-    transMap[globalAxisIdx].resize(1);
-    transMap[globalAxisIdx][0]=globalAxisIdx ;      
+    size_t globalIdx = dstGlobalIndex(idx);
+    transMap[globalIdx].resize(1);
+    transMap[globalIdx][0]=globalIdx ;      
   }
 
- 
-  axisDestination->checkAttributes() ;
   this->computeAlgorithm(axisSource->getLocalView(CElementView::WORKFLOW), axisDestination->getLocalView(CElementView::WORKFLOW)) ;
 }
 CATCH
 
+shared_ptr<CGridAlgorithm> CAxisAlgorithmReduceAxis::createGridAlgorithm(CGrid* gridSrc, CGrid* gridDst, int pos)
+{
+  auto algo=make_shared<CGridAlgorithmReduce>(gridSrc, gridDst, pos, shared_from_this(), operator_) ;
+  algo->computeAlgorithm(false) ;
+  return algo ; 
+}
 
 CAxisAlgorithmReduceAxis::~CAxisAlgorithmReduceAxis()