Changeset 1261 for XIOS/trunk/src/transformation/axis_algorithm_reduce_domain.cpp

Timestamp:

09/12/17 09:45:29 (7 years ago)

Author:

ymipsl

Message:

backport of rev1260 in trunk.

YM

File:

• XIOS/trunk/src/transformation/axis_algorithm_reduce_domain.cpp (modified) (3 diffs)

XIOS/trunk/src/transformation/axis_algorithm_reduce_domain.cpp

@@ -77 +77 @@
                                        CArray<double,1>& dataOut,
                                        std::vector<bool>& flagInitial,                     
-                                       bool ignoreMissingValue)
+                                       bool ignoreMissingValue, bool firstPass)
 {
-  reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue);
+  reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue, firstPass);
 }
 
@@ -102 +102 @@
   CArray<int,1>& axisDstIndex = axisDest_->index;
   int ni_glo = domainSrc_->ni_glo, nj_glo = domainSrc_->nj_glo;
-  if (jDir == dir_)
+  if (iDir == dir_)
   {
     int nbAxisIdx = axisDstIndex.numElements();
@@ -117 +117 @@
     }
   }
-  else if (iDir == dir_)
+  else if (jDir == dir_)
   {
     int nbAxisIdx = axisDstIndex.numElements();