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

Timestamp:

02/07/17 11:52:03 (7 years ago)

Author:

ymipsl

Message:

• Add label attribute for axis
• if label attribute is present, then only only string label for each level will be output in netcdf file, ie value and bounds will not be output.

YM

File:

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

XIOS/trunk/src/node/axis.cpp

@@ -27 +27 @@
       , isDistributed_(false), hasBounds_(false), isCompressible_(false)
       , numberWrittenIndexes_(0), totalNumberWrittenIndexes_(0), offsetWrittenIndexes_(0)
-      , transformationMap_(), hasValue(false)
+      , transformationMap_(), hasValue(false), hasLabel(false)
    {
    }
@@ -37 +37 @@
       , isDistributed_(false), hasBounds_(false), isCompressible_(false)
       , numberWrittenIndexes_(0), totalNumberWrittenIndexes_(0), offsetWrittenIndexes_(0)
-      , transformationMap_(), hasValue(false)
+      , transformationMap_(), hasValue(false), hasLabel(false)
    {
    }
@@ -176 +176 @@
          if (hasBounds_)
            sizeValEvent += CArray<double,2>::size(2 * it->second.size());
+ 
+         if (hasLabel)
+           sizeValEvent += CArray<StdString,1>::size(it->second.size());
 
          size_t size = CEventClient::headerSize + getId().size() + sizeof(size_t) + std::max(sizeIndexEvent, sizeValEvent);
@@ -261 +264 @@
       this->checkMask();
       this->checkBounds();
+      this->checkLabel();
 
       isDistributed_ = (!this->begin.isEmpty() && !this->n.isEmpty() && (this->begin + this->n < this->n_glo)) ||
@@ -333 +337 @@
   }
 
+  void CAxis::checkLabel()
+  {
+    if (!label.isEmpty())
+    {
+      if (label.extent(0) != n)
+        ERROR("CAxis::checkLabel(void)",
+              << "The label array of the axis [ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] must be of dimension of axis size." << std::endl
+              << "Axis size is " << n.getValue() << "." << std::endl
+              << "label size is "<< label.extent(0)<<  " .");
+      hasLabel = true;
+    }
+    else hasLabel = false;
+  }
   void CAxis::checkEligibilityForCompressedOutput()
   {
@@ -657 +674 @@
     list<CArray<double,1> > list_val;
     list<CArray<double,2> > list_bounds;
+    list<CArray<StdString,1> > list_label;
 
     std::map<int, std::vector<size_t> >::const_iterator it, iteMap;
@@ -675 +693 @@
         list_bounds.push_back(CArray<double,2>(2,nbData));
       }
+      
+      if (hasLabel)
+      {
+        list_label.push_back(CArray<StdString,1>(nbData));
+      }
 
       CArray<int,1>& indi = list_indi.back();
@@ -693 +716 @@
           boundsVal(1, n) = bounds(1,n);
         }
+        
+        if (hasLabel)
+        {
+          CArray<StdString,1>& labelVal = list_label.back();
+          labelVal(n) = label(n);
+        }
       }
 
@@ -716 +745 @@
       {
         list_msgsVal.back() << list_bounds.back();
+      }
+ 
+      if (hasLabel)
+      {
+        list_msgsVal.back() << list_label.back();
       }
 
@@ -783 +817 @@
     CArray<double,1> val;
     CArray<double,2> boundsVal;
+    CArray<StdString,1> labelVal;
 
     buffer >> val;
     if (hasBounds_) buffer >> boundsVal;
+    if (hasLabel) buffer >> labelVal;
 
     int i, j, ind_srv;
@@ -798 +834 @@
         bound_srv(1,ind_srv) = boundsVal(1, ind);
       }
+
+      if (hasLabel)
+      {
+        label_srv(ind_srv) = labelVal( ind);
+      }
+
     }
   }
@@ -836 +878 @@
         bound_srv(0,ind) = bounds(0,ind);
         bound_srv(1,ind) = bounds(1,ind);
+      }
+      if (hasLabel)
+      {
+        label_srv(ind) = label(ind);
       }
     }
@@ -927 +973 @@
       value_srv.resize(zoom_size_srv);
       if (hasBounds_)  bound_srv.resize(2,zoom_size_srv);
+      if (hasLabel)  label_srv.resize(zoom_size_srv);
     }
   }