Changeset 816 for XIOS/trunk/src/node/axis.cpp

Timestamp:

01/26/16 18:19:04 (8 years ago)

Author:

mhnguyen

Message:

Changing value of axis from obligatory to optional attribute

Test
+) On Curie
+) Test passes

File:

• XIOS/trunk/src/node/axis.cpp (modified) (5 diffs)

XIOS/trunk/src/node/axis.cpp

@@ -26 +26 @@
       , isDistributed_(false), hasBounds_(false), isCompressible_(false)
       , numberWrittenIndexes_(0), totalNumberWrittenIndexes_(0), offsetWrittenIndexes_(0)
-      , transformationMap_(), global_zoom_begin(0), global_zoom_size(0)
+      , transformationMap_(), global_zoom_begin(0), global_zoom_size(0), hasValue(false)
    {
    }
@@ -35 +35 @@
       , isDistributed_(false), hasBounds_(false), isCompressible_(false)
       , numberWrittenIndexes_(0), totalNumberWrittenIndexes_(0), offsetWrittenIndexes_(0)
-      , transformationMap_(), global_zoom_begin(0), global_zoom_size(0)
+      , transformationMap_(), global_zoom_begin(0), global_zoom_size(0), hasValue(false)
    {
    }
@@ -220 +220 @@
       else this->n.setValue(size);
 
-      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() << ").");
+      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() << ").");
+        this->hasValue = true;
+      }
+
+//      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->checkData();
@@ -351 +361 @@
      {
        sendServerAttribut(globalDim, orderPositionInGrid, distType);
-       sendValue(globalDim, orderPositionInGrid, distType);
+       if (hasValue) sendValue(globalDim, orderPositionInGrid, distType);
      }
 
@@ -864 +874 @@
       zoom_size_srv  = zoom_end_srv - zoom_begin_srv + 1;
     }
-    value_srv.resize(zoom_size_srv);
-    bound_srv.resize(2,zoom_size_srv);
+    if (hasValue)
+    {
+      value_srv.resize(zoom_size_srv);
+      if (hasBounds_)  bound_srv.resize(2,zoom_size_srv);
+    }
   }