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

Timestamp:

12/16/14 12:55:53 (9 years ago)

Author:

mhnguyen

Message:

Reorganizing structure of grid

+) Grid doesn't have domain_ref and axis_ref anymore.
All domain and axis of a grid must be inside grid (These domain and axis can be defined or refer to others)
+) Grid contains list of domain and axis
+) Reorder some functions to make sure new functionlities work

Test
+) On Curie
+) Mode attached and detached
+) Only test_new_features
+) Passed

File:

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

XIOS/trunk/src/node/axis.cpp

@@ -9 +9 @@
 
 namespace xios {
-   
+
    /// ////////////////////// Définitions ////////////////////// ///
 
    CAxis::CAxis(void)
       : CObjectTemplate<CAxis>()
-      , CAxisAttributes(), isChecked(false), relFiles()
+      , CAxisAttributes(), isChecked(false), relFiles(), baseRefObject()
    { /* Ne rien faire de plus */ }
 
    CAxis::CAxis(const StdString & id)
       : CObjectTemplate<CAxis>(id)
-      , CAxisAttributes(), isChecked(false), relFiles()
+      , CAxisAttributes(), isChecked(false), relFiles(), baseRefObject()
    { /* Ne rien faire de plus */ }
 
@@ -56 +56 @@
          ERROR("CAxis::checkAttributes(void)",<< "Attribut <size> of the axis must be specified") ;
       StdSize size = this->size.getValue();
-      
+
       StdSize zoom_begin,zoom_end, zoom_size ;
-      
+
       zoom_begin = (this->zoom_begin.isEmpty()) ?  1 : this->zoom_begin.getValue() ;
-      zoom_end = (this->zoom_end.isEmpty()) ?  size : this->zoom_end.getValue() ; 
+      zoom_end = (this->zoom_end.isEmpty()) ?  size : this->zoom_end.getValue() ;
       zoom_size = (this->zoom_size.isEmpty()) ?  size : this->zoom_size.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 ;
-      
+
       if ( (zoom_begin < 1) || (zoom_begin > size) || (zoom_end<1) || (zoom_end>size) || (zoom_size<1) || (zoom_size>size) || (zoom_begin>zoom_end))
         ERROR("CAxis::checkAttributes(void)",<< "One or more attribut of <zoom_begin>, <zoom_end>, <zoom_size>, are not well specified") ;
@@ -72 +72 @@
       this->zoom_end.setValue(zoom_end) ;
       this->zoom_size.setValue(zoom_size) ;
-      
+
       StdSize true_size = value.numElements();
       if (size != true_size)
@@ -81 +81 @@
    }
 
+   DEFINE_REF_FUNC(Axis,axis)
+
    ///---------------------------------------------------------------