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

Timestamp:

06/22/15 13:36:37 (9 years ago)

Author:

mhnguyen

Message:

Final tests of zoom and inverse on axis

+) Modify test_client and test_complete to work with new grid definition
+) Correct some bugs causing memory leak
+) Clean abundant code
+) Add more comments to new files

Test
+) On Curie
+) test_client and test_complete pass with correct results

File:

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

XIOS/trunk/src/node/axis.cpp

@@ -95 +95 @@
       }
       else this->ni.setValue(size);
-      std::cout <<  "value " <<  value <<  std::endl;
+
 //      StdSize true_size = value.numElements();
 //      if (this->ni.getValue() != true_size)
@@ -135 +135 @@
    }
 
-   void CAxis::checkZoom(void)
-   {
-      StdSize zoom_begin,zoom_end, zoom_size, axisSize;
-
-      zoom_begin = this->zoom_begin.isEmpty() ? 0 : this->zoom_begin.getValue();
-      zoom_size  = this->zoom_size.isEmpty() ? size.getValue() : this->zoom_size.getValue();
-      zoom_end   = this->zoom_end.isEmpty() ? (size.getValue() - 1) : this->zoom_end.getValue();
-
-      if (this->zoom_begin.isEmpty()) zoom_begin = zoom_end - zoom_size + 1;
-      if (this->zoom_end.isEmpty()) zoom_end = zoom_begin + zoom_size - 1;
-      if (this->zoom_size.isEmpty()) zoom_size = zoom_end - zoom_begin + 1;
-      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 attributes among <zoom_begin>, <zoom_end>, <zoom_size> of axis [ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] are not well specified");
-
-      this->zoom_begin.setValue(zoom_begin);
-      this->zoom_end.setValue(zoom_end);
-      this->zoom_size.setValue(zoom_size);
-   }
+//   void CAxis::checkZoom(void)
+//   {
+//      StdSize zoom_begin,zoom_end, zoom_size, axisSize;
+//
+//      zoom_begin = (this->zoom_begin.isEmpty()) ?  0 : this->zoom_begin.getValue() ;
+//      zoom_size  = (this->zoom_size.isEmpty()) ?  size.getValue() : this->zoom_size.getValue() ;
+//      zoom_end   = (this->zoom_end.isEmpty()) ?  (size.getValue() - 1) : this->zoom_end.getValue() ;
+//
+//      if (this->zoom_begin.isEmpty()) zoom_begin=zoom_end-zoom_size+1 ;
+//      if (this->zoom_end.isEmpty()) zoom_end=zoom_begin+zoom_size-1 ;
+//      if (this->zoom_size.isEmpty()) zoom_size=zoom_end-zoom_begin+1 ;
+//      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 attributes among <zoom_begin>, <zoom_end>, <zoom_size> of axis [ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] are not well specified");
+//
+//      this->zoom_begin.setValue(zoom_begin) ;
+//      this->zoom_end.setValue(zoom_end) ;
+//      this->zoom_size.setValue(zoom_size) ;
+//   }
 
    void CAxis::checkMask()