Changeset 369 for XIOS/trunk/src/node/field.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/field.hpp (modified) (7 diffs)

XIOS/trunk/src/node/field.hpp

@@ -11 +11 @@
 #include "declare_group.hpp"
 #include "calendar_util.hpp"
+#include "array_new.hpp"
+#include "attribute_array.hpp"
 //#include "context.hpp"
 
@@ -80 +82 @@
          boost::shared_ptr<func::CFunctor> getFieldOperation(void) const;
          
-         ARRAY(double, 1) getData(void) const;
+         CArray<double, 1> getData(void) const;
 
          const StdString & getBaseFieldId(void) const;
@@ -89 +91 @@
          void resetNStep() ;
 
-         template <StdSize N> bool updateData(const ARRAY(double, N)   data);
+         template <int N> bool updateData(const CArray<double, N>&   data);
          
          bool updateDataServer
                (const CDate & currDate,
-                const std::deque<ARRAY(double, 1)> storedClient);
+                const std::deque< CArray<double, 1>* > storedClient);
  
        public :
@@ -106 +108 @@
          void solveOperation(void);
 
-         virtual void fromBinary(StdIStream & is);
+//         virtual void fromBinary(StdIStream & is);
 
          /// Destructeur ///
@@ -117 +119 @@
          static ENodeType GetType(void);
          
-        template <StdSize N> void setData(const ARRAY(double, N) _data) ;
+        template <int N> void setData(const CArray<double, N>& _data) ;
         static bool dispatchEvent(CEventServer& event) ;
         void sendUpdateData(void) ;
@@ -123 +125 @@
         void recvUpdateData(vector<int>& ranks, vector<CBufferIn*>& buffers) ;
         void writeField(void) ;
-        void outputField(ARRAY(double,3) fieldOut) ;
-        void outputField(ARRAY(double,2) fieldOut) ;
+        void outputField(CArray<double,3>& fieldOut) ;
+        void outputField(CArray<double,2>& fieldOut) ;
         
       public :
@@ -145 +147 @@
          map<int,boost::shared_ptr<func::CFunctor> > foperation_srv;
          
-         ARRAY(double, 1) data;
-         map<int,ARRAY(double,1)> data_srv ;
+         CArray<double, 1> data;
+         map<int, CArray<double,1>* > data_srv ;
 
    }; // class CField