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

XIOS/trunk/src/node/field_impl.hpp

@@ -8 +8 @@
 #include "grid.hpp"
 #include "timer.hpp"
-#include "array.hpp"
+#include "array_new.hpp"
+
 
 namespace xios {
 
-   template <StdSize N>
-   void CField::setData(const ARRAY(double, N) _data)
+   template <int N>
+   void CField::setData(const CArray<double, N>& _data)
    {
      const std::vector<CField*>& refField=getAllReference();
@@ -21 +22 @@
     }
     
-   template <StdSize N>
-      bool CField::updateData(const ARRAY(double, N) _data)
+   template <int N>
+      bool CField::updateData(const CArray<double, N>& _data)
    {        
       CContext* context=CContext::getCurrent();
@@ -35 +36 @@
       if (opeDate <= currDate)
       {
-         if (this->data->num_elements() != this->grid->storeIndex_client->num_elements())
+         if (this->data.numElements() != this->grid->storeIndex_client.numElements())
          {
-            this->data->resize(boost::extents[this->grid->storeIndex_client ->num_elements()]);
+            this->data.resize(this->grid->storeIndex_client.numElements());
          }
             
-         ARRAY_CREATE(input, double, 1, [this->data->num_elements()]);
+         CArray<double,1> input(data.numElements()) ;
          this->grid->inputField(_data, input);          
          (*this->foperation)(input);