Changeset 1421 for XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp

Timestamp:

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

Author:

oabramkina

Message:

Bugfix in case of a hole defined on an axis.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp (modified) (4 diffs)

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;