Changeset 2291 for XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm

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

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm

Files:

• scalar_algorithm_reduce_axis.cpp (modified) (1 diff)
• scalar_algorithm_reduce_domain.cpp (modified) (1 diff)
• scalar_algorithm_reduce_scalar.cpp (modified) (3 diffs)
• scalar_algorithm_reduce_scalar.hpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm/scalar_algorithm_reduce_axis.cpp

@@ -79 +79 @@
 
   } 
+
+  bool local=false ;
+  if (!algo->local.isEmpty()) local=algo->local ;
   
-  int globalIndexSize = axisSource-> n_glo;
-  for (int idx = 0; idx < globalIndexSize; ++idx)  transformationMapping_[0].push_back(idx);
+  auto& transMap = this->transformationMapping_;  
+  
+  if (local)
+  {
+    scalarDestination->n=1 ; // no mask
+    scalarDestination->mask.reset() ;
+    
+    CArray<size_t,1> srcGlobalIndex ;
+    axisSource->getLocalView(CElementView::WORKFLOW)->getGlobalIndexView(srcGlobalIndex) ;
+    size_t nbIdx = srcGlobalIndex.numElements();
+    if (nbIdx==0) scalarDestination->n=0 ;
+    scalarDestination->checkAttributes() ;
 
-  scalarDestination->checkAttributes() ;
+    for (size_t idx = 0; idx < nbIdx; ++idx)
+    {
+      size_t globalIdx = srcGlobalIndex(idx);
+      transformationMapping_[0].push_back(globalIdx);
+    }
+
+  }
+  else
+  {
+   scalarDestination->checkAttributes() ;
+
+   int globalIndexSize = axisSource->getLocalView(CElementView::WORKFLOW)->getGlobalSize();
+   CArray<size_t,1> dstGlobalIndex ;
+   scalarDestination->getLocalView(CElementView::WORKFLOW)->getGlobalIndexView(dstGlobalIndex) ;
+   if (dstGlobalIndex.numElements()!=0)
+     for (int idx = 0; idx < globalIndexSize; ++idx)  transformationMapping_[0].push_back(idx);
+  }
+
   this->computeAlgorithm(axisSource->getLocalView(CElementView::WORKFLOW), scalarDestination->getLocalView(CElementView::WORKFLOW)) ;
   

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm/scalar_algorithm_reduce_domain.cpp

@@ -74 +74 @@
   }
 
-  TransformationIndexMap& transMap = this->transformationMapping_;
-
-  int ni_glo = domainSrc_->ni_glo ;
-  int nj_glo = domainSrc_->nj_glo ;
-  int nbDomainIdx ;
+  bool local=false ;
+  if (!algo->local.isEmpty()) local=algo->local ;
   
-  bool  local = algo->local ;
+  auto& transMap = this->transformationMapping_;  
   
   if (local)
   {
-      const CArray<int, 1>& i_index = domainSrc_-> i_index.getValue() ;
-      const CArray<int, 1>& j_index = domainSrc_-> j_index.getValue() ;
-      const CArray<bool,1>& localMask = domainSrc_-> localMask ;
-      int nbDomainIdx = i_index.numElements();
+    scalarDestination->n=1 ; // no mask
+    scalarDestination->mask.reset() ;
+    
+    CArray<size_t,1> srcGlobalIndex ;
+    domainSource->getLocalView(CElementView::WORKFLOW)->getGlobalIndexView(srcGlobalIndex) ;
+    size_t nbIdx = srcGlobalIndex.numElements();
+    if (nbIdx==0) scalarDestination->n=0 ;
+    scalarDestination->checkAttributes() ;
 
-      for (int idxDomain = 0; idxDomain < nbDomainIdx; ++idxDomain)
-      {
-        if (localMask(idxDomain))
-        { 
-          transMap[0].push_back(j_index(idxDomain)* ni_glo + i_index(idxDomain));
-        }
-      }
+    for (size_t idx = 0; idx < nbIdx; ++idx)
+    {
+      size_t globalIdx = srcGlobalIndex(idx);
+      transformationMapping_[0].push_back(globalIdx);
+    }
+
   }
   else
-  {  
-    nbDomainIdx = ni_glo * nj_glo;
-    for (int idxDomain = 0; idxDomain < nbDomainIdx; ++idxDomain) transMap[0].push_back(idxDomain);    
+  {
+   scalarDestination->checkAttributes() ;
+
+   int globalIndexSize = domainSource->getLocalView(CElementView::WORKFLOW)->getGlobalSize();
+   CArray<size_t,1> dstGlobalIndex ;
+   scalarDestination->getLocalView(CElementView::WORKFLOW)->getGlobalIndexView(dstGlobalIndex) ;
+   if (dstGlobalIndex.numElements()!=0)
+     for (int idx = 0; idx < globalIndexSize; ++idx)  transformationMapping_[0].push_back(idx);
   }
-  
-  scalarDestination->checkAttributes() ;
+
   this->computeAlgorithm(domainSource->getLocalView(CElementView::WORKFLOW), scalarDestination->getLocalView(CElementView::WORKFLOW)) ;
+
 }
 CATCH

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm/scalar_algorithm_reduce_scalar.cpp

@@ -10 +10 @@
 #include "grid_transformation_factory_impl.hpp"
 #include "reduction.hpp"
+#include "grid_algorithm_reduce.hpp"
+
 
 
@@ -47 +49 @@
 TRY
 {
-  eliminateRedondantSrc_= false ;
+  scalarDestination->checkAttributes() ;
   if (algo->operation.isEmpty())
     ERROR("CScalarAlgorithmReduceScalar::CScalarAlgorithmReduceScalar(CScalar* scalarDestination, CScalar* scalarSource, CReduceScalarToScalar* algo)",
@@ -75 +77 @@
 
   }
-  transformationMapping_[0].push_back(0) ;
+  
+  auto& transMap = this->transformationMapping_;
+  
+  CArray<size_t,1> dstGlobalIndex ;
+  scalarDestination->getLocalView(CElementView::WORKFLOW)->getGlobalIndexView(dstGlobalIndex) ;
+  size_t nbIdx = dstGlobalIndex.numElements();
 
-  scalarDestination->checkAttributes() ;
+  for (size_t idx = 0; idx < nbIdx; ++idx)
+  {
+    size_t globalIdx = dstGlobalIndex(idx);
+    transMap[globalIdx].resize(1);
+    transMap[globalIdx][0]=globalIdx ;      
+  }
+
   this->computeAlgorithm(scalarSource->getLocalView(CElementView::WORKFLOW), scalarDestination->getLocalView(CElementView::WORKFLOW)) ; 
 }
 CATCH
+
+shared_ptr<CGridAlgorithm> CScalarAlgorithmReduceScalar::createGridAlgorithm(CGrid* gridSrc, CGrid* gridDst, int pos)
+{
+  auto algo=make_shared<CGridAlgorithmReduce>(gridSrc, gridDst, pos, shared_from_this(), operator_) ;
+  algo->computeAlgorithm(false) ;
+  return algo ; 
+}
 
 CScalarAlgorithmReduceScalar::~CScalarAlgorithmReduceScalar()

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm/scalar_algorithm_reduce_scalar.hpp

@@ -42 +42 @@
                                                 std::map<int, int>& elementPositionInGridDst2AxisPosition,
                                                 std::map<int, int>& elementPositionInGridDst2DomainPosition);
+  virtual shared_ptr<CGridAlgorithm> createGridAlgorithm(CGrid* gridSrc, CGrid* gridDst, int pos);
   static bool dummyRegistered_;
 };