Changeset 1313 for XIOS/dev/XIOS_DEV_CMIP6/src

Timestamp:

10/24/17 11:23:54 (7 years ago)

Author:

ymipsl

Message:

Add "local" attribute to reduce_domain_to_scalar transformation. The reduction is only apply on local domain.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• config/reduce_domain_to_scalar_attribute.conf (modified) (1 diff)
• node/reduce_domain_to_scalar.cpp (modified) (1 diff)
• transformation/scalar_algorithm_reduce_domain.cpp (modified) (2 diffs)
• transformation/scalar_algorithm_reduce_domain.hpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/config/reduce_domain_to_scalar_attribute.conf

@@ -1 +1 @@
 DECLARE_ENUM4(operation, min, max, sum, average)
+DECLARE_ATTRIBUTE(bool, local)

XIOS/dev/XIOS_DEV_CMIP6/src/node/reduce_domain_to_scalar.cpp

@@ -39 +39 @@
   void CReduceDomainToScalar::checkValid(CScalar* scalarDst, CDomain* domainSrc)
   {
+    if (this->local.isEmpty()) local=false ;
   }
 

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/scalar_algorithm_reduce_domain.cpp

@@ -76 +76 @@
 
   reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
+  local = algo->local ;
 }
 
@@ -105 +106 @@
   TransformationWeightMap& transWeight = this->transformationWeight_[0];
 
-  int globalIndexSize = domainSrc_->ni_glo * domainSrc_->nj_glo;  
+  int ni_glo = domainSrc_->ni_glo ;
+  int nj_glo = domainSrc_->nj_glo ;
+  int nbDomainIdx ;
+  
+  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();
 
-  transMap[0].resize(globalIndexSize);
-  transWeight[0].resize(globalIndexSize, 1.0);
-  for (int idx = 0; idx < globalIndexSize; ++idx)
-  {     
-    transMap[0][idx] = idx;    
+      for (int idxDomain = 0; idxDomain < nbDomainIdx; ++idxDomain)
+      {
+        if (localMask(idxDomain))
+        { 
+          transMap[0].push_back(j_index(idxDomain)* ni_glo + i_index(idxDomain));
+          transWeight[0].push_back(1.0) ;
+        }
+      }
   }
+  else
+  {  
+    nbDomainIdx = ni_glo * nj_glo;
+    transMap[0].resize(nbDomainIdx);
+    transWeight[0].resize(nbDomainIdx, 1.0);
+    for (int idxDomain = 0; idxDomain < nbDomainIdx; ++idxDomain) transMap[0][idxDomain] = idxDomain;    
+  }
+  
 }
 

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/scalar_algorithm_reduce_domain.hpp

@@ -41 +41 @@
   static bool registerTrans();
 protected:
+  bool local ;
   void computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs);