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

Timestamp:

07/10/17 15:16:17 (7 years ago)

Author:

mhnguyen

Message:

Porting non-continuous axis zoom to dev branch

+) Port axis zoom
+) Resolve some merge conflicts
+) Revert some codes

Test
+) On Curie
+) Ok

File:

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

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

@@ -119 +119 @@
          CTransformation<CAxis>* addTransformation(ETranformationType transType, const StdString& id="");
          bool isEqual(CAxis* axis);
+         bool zoomByIndex();
 
-      public:
-        int zoom_begin_srv, zoom_end_srv, zoom_size_srv;
-        int ni_srv, begin_srv, end_srv;
-        int global_zoom_begin_srv, global_zoom_end_srv, global_zoom_size_srv;
-        CArray<double,1> value_srv;
-        CArray<double,2> bound_srv;
+      public:                
         CArray<StdString,1> label_srv;
-        CArray<int,1> zoom_index_srv;
         bool hasValue;
         CArray<int,1> globalDimGrid;
@@ -146 +141 @@
          void computeConnectedServer(const std::vector<int>& globalDim, int orderPositionInGrid,
                                      CServerDistributionDescription::ServerDistributionType distType);
-         bool zoomByIndex();
 
          void sendNonDistributedAttributes(void);
@@ -175 +169 @@
          std::map<int, CArray<int,1> > indiSrv_;
          bool hasBounds_;
-         bool hasLabel;
-         bool doZoomByIndex_;
+         bool hasLabel;         
          bool computedWrittenIndex_;