Changeset 1421 for XIOS/dev/XIOS_DEV_CMIP6/src

Timestamp:

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

Author:

oabramkina

Message:

Bugfix in case of a hole defined on an axis.

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• io/nc4_data_output.cpp (modified) (4 diffs)
• node/axis.cpp (modified) (4 diffs)
• node/grid.hpp (modified) (5 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_output.cpp

@@ -1285 +1285 @@
             int nbWritten = indexToWrite.numElements();
             CArray<double,1> axis_value(indexToWrite.numElements());
-            for (int i = 0; i < nbWritten; i++) axis_value(i) = axis->value(indexToWrite(i));
+            for (int i = 0; i < nbWritten; i++)
+            {
+              if (i < axis->value.numElements())
+                axis_value(i) = axis->value(indexToWrite(i));
+              else
+                axis_value(i) = 0.;
+            }
+
             CArray<double,2> axis_bounds;
             CArray<string,1> axis_label;
@@ -1291 +1298 @@
             {
               axis_label.resize(indexToWrite.numElements());
-              for (int i = 0; i < nbWritten; i++) axis_label(i) = axis->label(indexToWrite(i));
+              for (int i = 0; i < nbWritten; i++)
+              {
+                if (i < axis->label.numElements())
+                  axis_label(i) = axis->label(indexToWrite(i));
+                else
+                  axis_label(i) = boost::lexical_cast<string>(0);  // Write 0 as a label
+              }
             }
 
@@ -1306 +1319 @@
                     for (int i = 0; i < nbWritten; ++i)
                     {
-                      axis_bounds(0, i) = axis->bounds(0, int(indexToWrite(i)));
-                      axis_bounds(1, i) = axis->bounds(1, int(indexToWrite(i)));
+                      if (i < axis->bounds.columns())
+                      {
+                        axis_bounds(0, i) = axis->bounds(0, int(indexToWrite(i)));
+                        axis_bounds(1, i) = axis->bounds(1, int(indexToWrite(i)));
+                      }
+                      else
+                      {
+                        axis_bounds(0, i) = 0.;
+                        axis_bounds(1, i) = 0.;
+
+                      }
                     }
 
@@ -1337 +1359 @@
                   for (int i = 0; i < nbWritten; ++i)
                   {
-                    axis_bounds(0, i) = axis->bounds(0, int(indexToWrite(i)));
-                    axis_bounds(1, i) = axis->bounds(1, int(indexToWrite(i)));
+                    if (i < axis->bounds.columns())
+                    {
+                      axis_bounds(0, i) = axis->bounds(0, int(indexToWrite(i)));
+                      axis_bounds(1, i) = axis->bounds(1, int(indexToWrite(i)));
+                    }
+                    else
+                    {
+                      axis_bounds(0, i) = 0.;
+                      axis_bounds(1, i) = 0.;
+                    }
                   }
                   SuperClassWriter::writeData(axis_bounds, axisBoundsId, isCollective, 0, &startBounds, &countBounds);

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

@@ -16 +16 @@
 namespace xios {
 
-   /// ////////////////////// Définitions ////////////////////// ///
+   /// ////////////////////// Definitions ////////////////////// ///
 
    CAxis::CAxis(void)
@@ -284 +284 @@
       }
 
+      // Remove this check because it doen't make sense in case of a hole or overlapping axes
       if (!this->value.isEmpty())
       {
-        StdSize true_size = value.numElements();
-        if (this->n.getValue() != true_size)
-          ERROR("CAxis::checkAttributes(void)",
-                << "[ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] "
-                << "The axis is wrongly defined, attribute 'value' has a different size (" << true_size << ") than the one defined by the \'size\' attribute (" << n.getValue() << ").");
+//        StdSize true_size = value.numElements();
+//        if (this->n.getValue() != true_size)
+//          ERROR("CAxis::checkAttributes(void)",
+//                << "[ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] "
+//                << "The axis is wrongly defined, attribute 'value' has a different size (" << true_size << ") than the one defined by the \'size\' attribute (" << n.getValue() << ").");
         this->hasValue = true;
       }
 
-      this->checkData();
-      this->checkZoom();
-      this->checkMask();
       this->checkBounds();
-      this->checkLabel();
+
+      CContext* context=CContext::getCurrent();
+      if (context->hasClient)
+      {
+        this->checkData();
+        this->checkZoom();
+        this->checkMask();
+        this->checkLabel();
+      }
    }
 
@@ -457 +463 @@
      if (this->areClientAttributesChecked_) return;
 
-     this->checkAttributes();
+     CContext* context=CContext::getCurrent();
+     if (context->hasClient && !context->hasServer) this->checkAttributes();
 
      this->areClientAttributesChecked_ = true;
@@ -697 +704 @@
       }
 
-      localIndexToWriteOnServer.resize(nbWritten);
+      localIndexToWriteOnServer.resize(writtenGlobalIndex.numElements());
+//      localIndexToWriteOnServer.resize(nbWritten);
 
       nbWritten = 0;

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;
         }