Changeset 369 for XIOS/trunk/src/node/domain.hpp

Timestamp:

10/16/12 13:04:44 (12 years ago)

Author:

ymipsl

Message:

Major Update

• redesign Type and attribute manipulation
• add enumerate type and attribute
• use blitz class array instead of boost class array

YM

File:

• XIOS/trunk/src/node/domain.hpp (modified) (5 diffs)

XIOS/trunk/src/node/domain.hpp

@@ -10 +10 @@
 #include "event_server.hpp"
 #include "buffer_in.hpp"
+#include "array_new.hpp"
+#include "attribute_array.hpp"
 
 namespace xios {
@@ -73 +75 @@
       
          /// Autres ///
-         virtual void fromBinary(StdIStream & is);
+//         virtual void fromBinary(StdIStream & is);
 
          /// Accesseurs ///
-         ARRAY(int, 2) getLocalMask(void) const;
+         CArray<int, 2> getLocalMask(void) const;
          
          const std::set<StdString> & getRelFiles(void) const;
@@ -90 +92 @@
          const std::vector<int> & getNjZoomSub(void) const;
          
-         const std::vector<ARRAY(double, 1)> & getLonValueSub(void) const;
-         const std::vector<ARRAY(double, 1)> & getLatValueSub(void) const;
+         const std::vector<CArray<double,1>* > & getLonValueSub(void) const;
+         const std::vector<CArray<double,1>* > & getLatValueSub(void) const;
 
          /// Test ///
@@ -111 +113 @@
          int zoom_nj_srv,zoom_jbegin_srv,zoom_jend_srv ;
 
-         ARRAY(double, 1) lonvalue_srv, latvalue_srv ;
+         CArray<double, 1> lonvalue_srv, latvalue_srv ;
          
          
@@ -142 +144 @@
          static ENodeType GetType(void);
 
+         CArray<int, 2> local_mask;
+
        private :
 
          /// Proriétés protégées ///
          bool isChecked;
-         ARRAY(int, 2) local_mask;
          std::set<StdString> relFiles;
 
          std::vector<int> ibegin_sub, iend_sub, jbegin_sub, jend_sub;
          std::vector<int> ibegin_zoom_sub, jbegin_zoom_sub, ni_zoom_sub, nj_zoom_sub;
-         std::vector<ARRAY(double, 1)> lonvalue_sub, latvalue_sub;
+         std::vector<CArray<double,1>* > lonvalue_sub, latvalue_sub;