Changeset 1299

Timestamp:

10/09/17 10:07:07 (7 years ago)

Author:

ymipsl

Message:

Add new attribute "local" in reduce_domain_to_axis transformation :

• "local" mean that the reduction is apply locally ie only on current process.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• config/reduce_domain_to_axis_attribute.conf (modified) (1 diff)
• node/reduce_domain_to_axis.cpp (modified) (1 diff)
• transformation/axis_algorithm_reduce_domain.cpp (modified) (3 diffs)
• transformation/axis_algorithm_reduce_domain.hpp (modified) (1 diff)

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

@@ -3 +3 @@
 /* Direction to apply operation (i, j) */
 DECLARE_ENUM2(direction,  iDir, jDir)
+DECLARE_ATTRIBUTE(bool, local)

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

@@ -62 +62 @@
              << "Domain source " <<domainSrc->getId() << std::endl
              << "Axis destination " << axisDst->getId());
-    
+    if (this->local.isEmpty()) local=false ;
+
     switch (direction)
     {

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

@@ -71 +71 @@
   dir_ = (CReduceDomainToAxis::direction_attr::iDir == algo->direction)  ? iDir : jDir;
   reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
+  local = algo->local ;
 }
 
@@ -104 +105 @@
   if (iDir == dir_)
   {
-    int nbAxisIdx = axisDstIndex.numElements();
-    for (int idxAxis = 0; idxAxis < nbAxisIdx; ++idxAxis)
+    if (local)
     {
-      int globalAxisIdx = axisDstIndex(idxAxis);
-      transMap[globalAxisIdx].resize(ni_glo);
-      transWeight[globalAxisIdx].resize(ni_glo);
-      for (int idx = 0; idx < ni_glo; ++idx)
+      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();
+      
+      for (int idxDomain = 0; idxDomain < nbDomainIdx; ++idxDomain)
       {
-        transMap[globalAxisIdx][idx] = globalAxisIdx * ni_glo + idx;
-        transWeight[globalAxisIdx][idx] = 1.0;
+        if (localMask(idxDomain))
+        { 
+          transMap[j_index(idxDomain)].push_back(j_index(idxDomain)* ni_glo + i_index(idxDomain));
+          transWeight[j_index(idxDomain)].push_back(1.0) ;
+        }
+      }
+    }
+    else
+    {
+      int nbAxisIdx = axisDstIndex.numElements();
+      for (int idxAxis = 0; idxAxis < nbAxisIdx; ++idxAxis)
+      {
+        int globalAxisIdx = axisDstIndex(idxAxis);
+        transMap[globalAxisIdx].resize(ni_glo);
+        transWeight[globalAxisIdx].resize(ni_glo);
+        for (int idx = 0; idx < ni_glo; ++idx)
+        {
+          transMap[globalAxisIdx][idx] = globalAxisIdx * ni_glo + idx;
+          transWeight[globalAxisIdx][idx] = 1.0;
+        }
       }
     }
@@ -120 +140 @@
   {
     int nbAxisIdx = axisDstIndex.numElements();
-    for (int idxAxis = 0; idxAxis < nbAxisIdx; ++idxAxis)
+    if (local)
     {
-      int globalAxisIdx = axisDstIndex(idxAxis);
-      transMap[globalAxisIdx].resize(nj_glo);
-      transWeight[globalAxisIdx].resize(nj_glo);
-      for (int idx = 0; idx < nj_glo; ++idx)
+      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();
+      
+      for (int idxDomain = 0; idxDomain < nbDomainIdx; ++idxDomain)
       {
-        transMap[globalAxisIdx][idx] = globalAxisIdx + ni_glo*idx;
-        transWeight[globalAxisIdx][idx] = 1.0;
+        if (localMask(idxDomain))
+        { 
+          transMap[i_index(idxDomain)].push_back(j_index(idxDomain)* ni_glo + i_index(idxDomain));
+          transWeight[i_index(idxDomain)].push_back(1.0) ;
+        }
+      }
+    }
+    else
+    {
+      for (int idxAxis = 0; idxAxis < nbAxisIdx; ++idxAxis)
+      {
+        int globalAxisIdx = axisDstIndex(idxAxis);
+        transMap[globalAxisIdx].resize(nj_glo);
+        transWeight[globalAxisIdx].resize(nj_glo);
+        for (int idx = 0; idx < nj_glo; ++idx)
+        {
+          transMap[globalAxisIdx][idx] = globalAxisIdx + ni_glo*idx;
+          transWeight[globalAxisIdx][idx] = 1.0;
+        }
       }
     }

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

@@ -46 +46 @@
     jDir = 2
   };
-
+  
   ReduceDirection dir_;
+  bool local ;
+  
 protected:
   void computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs);