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

Timestamp:

03/10/15 10:49:09 (9 years ago)

Author:

mhnguyen

Message:

Implementing discovering algorithm of server index

+) Implement the algorithm with only one level
+) Remove some redundant functions, corrects some interface

Test
+) On Curie
+) Test passed and results are correct

File:

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

XIOS/trunk/src/node/axis.cpp

@@ -109 +109 @@
    void CAxis::checkZoom(void)
    {
-      StdSize zoom_begin,zoom_end, zoom_size;
+      StdSize zoom_begin,zoom_end, zoom_size, axisSize;
 
       zoom_begin = (this->zoom_begin.isEmpty()) ?  0 : this->zoom_begin.getValue() ;
@@ -118 +118 @@
       if (this->zoom_end.isEmpty()) zoom_end=zoom_begin+zoom_size-1 ;
       if (this->zoom_size.isEmpty()) zoom_size=zoom_end-zoom_begin+1 ;
-
-      if ( (zoom_begin < 0) || (zoom_begin > size-1) || (zoom_end<0) || (zoom_end>size-1) || (zoom_size<1) || (zoom_size>size) || (zoom_begin>zoom_end))
+      axisSize = size.getValue();
+
+      if ( (zoom_begin < 0) || (zoom_begin > axisSize-1) || (zoom_end<0) || (zoom_end>axisSize-1) || (zoom_size<1) || (zoom_size>axisSize) || (zoom_begin>zoom_end))
         ERROR("CAxis::checkAttributes(void)",<< "One or more attribut of <zoom_begin>, <zoom_end>, <zoom_size>, are not well specified") ;