Changeset 1421 for XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.hpp

Timestamp:

02/08/18 15:40:25 (7 years ago)

Author:

oabramkina

Message:

Bugfix in case of a hole defined on an axis.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.hpp (modified) (5 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.hpp

@@ -19 +19 @@
 namespace xios {
 
-   /// ////////////////////// Déclarations ////////////////////// ///
+   /// ////////////////////// Dￜￜclarations ////////////////////// ///
 
    class CGridGroup;
@@ -91 +91 @@
          StdSize  getDataSize(void) const;
 
-         /// Entrées-sorties de champs 
+         /// Entrￜￜes-sorties de champs
          template <int n>
          void inputField(const CArray<double,n>& field, CArray<double,1>& stored) const;
@@ -421 +421 @@
      int dim = domainMasks.size() * 2 + axisMasks.size();
      std::vector<CDomain*> domainP = this->getDomains();
+     std::vector<CAxis*> axisP = this->getAxis();
 
      std::vector<int> idxLoop(dim,0), indexMap(numElement), eachDimSize(dim);
@@ -434 +435 @@
       }
       else if (1 == axisDomainOrder(i)) {
-        eachDimSize[indexMap[i]] = axisMasks[idxAxis]->numElements();
+//        eachDimSize[indexMap[i]] = axisMasks[idxAxis]->numElements();
+        eachDimSize[indexMap[i]] = axisP[idxAxis]->n;
         ++idx; ++idxAxis;
       }
@@ -486 +488 @@
         else if (1 == axisDomainOrder(i))
         {
-          maskValue = maskValue && (*axisMasks[idxAxis])(idxLoop[indexMap[i]]);
+          int idxTmp = idxLoop[indexMap[i]];
+          if (idxTmp < (*axisMasks[idxDomain]).numElements())
+            maskValue = maskValue && (*axisMasks[idxAxis])(idxTmp);
+          else
+            maskValue = false;
+
           ++idxAxis;
         }