Changeset 1158 for XIOS/dev/dev_olga/src/node/axis.hpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/node/axis.hpp (modified) (5 diffs)

XIOS/dev/dev_olga/src/node/axis.hpp

@@ -68 +68 @@
 
          static CAxis* createAxis();
-     
+
+         /// Accesseurs ///
+         const std::set<StdString> & getRelFiles(void) const;
+
          int getNumberWrittenIndexes() const;
          int getTotalNumberWrittenIndexes() const;
@@ -115 +118 @@
          void duplicateTransformation(CAxis*);
          CTransformation<CAxis>* addTransformation(ETranformationType transType, const StdString& id="");
+         bool isEqual(CAxis* axis);
 
       public:
@@ -121 +125 @@
         CArray<double,1> value_srv;
         CArray<double,2> bound_srv;
+        CArray<StdString,1> label_srv;
         bool hasValue;
         CArray<int,1> globalDimGrid;
@@ -131 +136 @@
          void checkMask();
          void checkZoom();
-         void checkBounds();         
+         void checkBounds();
+         void checkLabel();
          void sendAttributes(const std::vector<int>& globalDim, int orderPositionInGrid,
                              CServerDistributionDescription::ServerDistributionType distType);
@@ -166 +172 @@
          std::map<int, CArray<int,1> > indiSrv_;
          bool hasBounds_;
-
+         bool hasLabel;
          bool doZoomByIndex_;
          bool computedWrittenIndex_;