Changeset 369 for XIOS/trunk/src/functor.cpp

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.cpp (modified) (4 diffs)

XIOS/trunk/src/functor.cpp

@@ -1 +1 @@
 #include "functor.hpp"
+#include "array_new.hpp"
 
 namespace xios
@@ -7 +8 @@
       /// ////////////////////// Définitions ////////////////////// ///
 
-      CFunctor::CFunctor(const StdString & id, ARRAY(double, 1) doutput)
+      CFunctor::CFunctor(const StdString & id, CArray<double, 1>& doutput)
          : SuperClass(id), doutput(doutput), nbcall(0)
       { /* Ne rien faire de plus */  }
@@ -16 +17 @@
       //---------------------------------------------------------------
 
-      ARRAY(double, 1) CFunctor::getDataOutput(void) const
+      CArray<double,1> CFunctor::getDataOutput(void) const
       { 
          return (this->doutput);
@@ -37 +38 @@
       //---------------------------------------------------------------
 
-      ARRAY(double, 1) CFunctor::operator ()(const ARRAY(double, 1) dinput)
+      CArray<double,1> CFunctor::operator ()(const CArray<double,1>& dinput)
       {
          this->nbcall++;
-         if (dinput->size() != this->doutput->size())
+         if (dinput.numElements() != this->doutput.numElements())
             ERROR("CFunctor::operator ()(dinput)",
-                   << "[ input size = "  << dinput->size()
-                   << ", output size = " << this->doutput->size() << " ]"
+                   << "[ input size = "  << dinput.numElements()
+                   << ", output size = " << this->doutput.numElements() << " ]"
                    << " size of input array !=  size of output array !");
          this->apply(dinput, this->doutput);