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

XIOS/trunk/src/functor.hpp

@@ -5 +5 @@
 #include "xmlioserver_spl.hpp"
 #include "exception.hpp"
-#include "array.hpp"
+#include "array_new.hpp"
 
 namespace xios
@@ -16 +16 @@
          /// Définition de type ///
          typedef CObject SuperClass;
-         typedef ARRAY(double, 1) DoubleArray;
 
          public :
 
             /// Accesseurs ///
-            DoubleArray getDataOutput(void) const;
+            CArray<double,1> getDataOutput(void) const;
             /// Opérateur ///
-            DoubleArray operator ()(const DoubleArray dinput);
+            CArray<double,1> operator ()(const CArray<double,1>& dinput);
 
             /// Destructeur ///
@@ -34 +33 @@
 
             /// Traitement ///
-            virtual void apply(const DoubleArray dinput, DoubleArray doutput) = 0;
+            virtual void apply(const CArray<double,1>& dinput, CArray<double,1>& doutput) = 0;
 
             /// Autres ///
@@ -42 +41 @@
             /// Constructeurs ///
             CFunctor(void);                             // Not implemented.
-            CFunctor(const StdString & id, DoubleArray doutput);
+            CFunctor(const StdString & id, CArray<double,1>& doutput);
             CFunctor(const CFunctor & functor);         // Not implemented.
             CFunctor(const CFunctor * const functor);   // Not implemented.
 
-         private :
-
+         protected :
             /// Propriétés privées ///
-            DoubleArray doutput;
-            
-         protected :
+            CArray<double,1>& doutput;
             /// Propriétés protégées ///   
             int nbcall;