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

Timestamp:

07/07/15 10:46:33 (9 years ago)

Author:

mhnguyen

Message:

Implementing zooming on a domain

+) Add algorithm to do zooming on a domain
+) Remove some redundant codes

Test
+) On Curie
+) test_complete and test_client are correct

File:

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

XIOS/trunk/src/node/axis.cpp

@@ -104 +104 @@
 //               << "The array \'value\' of axis [ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] has a different size that the one defined by the \'size\' attribute");
 
-      if (0 == global_zoom_size) global_zoom_size = size;
+
       this->checkData();
       this->checkMask();
-//      this->checkZoom();
+      this->checkZoom();
 
       if (!bounds.isEmpty())
@@ -138 +138 @@
    }
 
-//   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)
+   {
+     if (0 == global_zoom_size) global_zoom_size = this->size.getValue();
+   }
 
    void CAxis::checkMask()