Changeset 300 for XMLIO_V2/dev/common/src/array_impl.hpp

Timestamp:

02/13/12 19:35:25 (12 years ago)

Author:

ymipsl

Message:

nouvelle version de developpement de xios

• nouvelle interface fortran
• recodage complet de la couche de communication
• et bien d'autres choses...

YM

File:

• XMLIO_V2/dev/common/src/array_impl.hpp (modified) (4 diffs)

XMLIO_V2/dev/common/src/array_impl.hpp

@@ -3 +3 @@
 
 #include "array_mac.hpp"
+#include "buffer_in.hpp"
+#include "buffer_out.hpp"
 
 namespace xmlioserver
@@ -16 +18 @@
    { /* Ne rien faire de plus */ }
 
+   template <typename ValueType, StdSize NumDims, typename Allocator>
+       CArray<ValueType, NumDims, Allocator>::CArray()
+            : boost::multi_array<ValueType, NumDims, Allocator>
+                  (getExtentNull<NumDims>(), boost::fortran_storage_order())
+   { /* Ne rien faire de plus */ }
+   
    template <typename ValueType, StdSize NumDims, typename Allocator>
       template <typename ExtentList>
@@ -33 +41 @@
                                 const CArray<ValueType, NumDims, Allocator> & array)
    {
-      os << (array.data()[0]) << "(" << array.shape()[0];
+      os << "CArray (" ;
       for (StdSize i = 1; i < array.num_dimensions(); i++)
          os << ", " << array.shape()[i];
-      os << ")" << (array.data()[array.num_elements()-1]);
+      os << ") = " ; 
+      for (StdSize i = 0; i < array.num_elements(); i++) os << (array.data()[i])<<"  ";
       return (os);
    }
@@ -108 +117 @@
       is.read (reinterpret_cast<char*>(this->data()), nelem * sizeof(ValueType));
    }
+  
+    template <typename ValueType, StdSize NumDims, typename Allocator>
+    size_t CArray<ValueType, NumDims, Allocator>::getSize(void) const
+   {
+      typedef boost::multi_array_types::size_type LSize;
+      LSize nelem = this->num_elements();
+      LSize ndim  = this->num_dimensions();
+      const LSize * shape = this->shape();
+      const ValueType * data = this->data();
+      size_t ret ;
+      ret=sizeof(ndim) ;
+      for (LSize i = 0; i < ndim; i++ ) ret+=sizeof(shape[i]) ;
+      ret+=sizeof(nelem) ;
+      ret+=sizeof(ValueType)*nelem ;
+      return ret ;
+   }
+
+   template <typename ValueType, StdSize NumDims, typename Allocator>
+   bool CArray<ValueType, NumDims, Allocator>::toBuffer(CBufferOut& buffer) const
+   {
+      typedef boost::multi_array_types::size_type LSize;
+
+      LSize nelem = this->num_elements();
+      LSize ndim  = this->num_dimensions();
+      const LSize* shape = this->shape();
+      const ValueType* data = this->data();
+      bool ret ;
+      
+      ret=buffer.put(ndim) ;
+      for (LSize i = 0; i < ndim; i++ ) ret&=buffer.put(shape[i]) ;
+      ret&=buffer.put(nelem) ;
+      ret&=buffer.put(data,nelem) ;
+      return ret ;
+  }
+
+   template <typename ValueType, StdSize NumDims, typename Allocator>
+   bool CArray<ValueType, NumDims, Allocator>::fromBuffer(CBufferIn& buffer)
+   {
+      typedef boost::multi_array_types::size_type LSize;
+      LSize ndim = 0, nelem = 0, temp = 0;
+      std::vector<LSize> shape;
+      bool ret ;
+      
+      ret=buffer.get(ndim) ;
+      for (LSize i = 0; i < ndim; i++ )
+      {
+         ret&=buffer.get(temp) ;
+         shape.push_back(temp);
+      }
+      this->resize(shape);
+      ret&=buffer.get(nelem) ;
+      ret&=buffer.get(this->data(),nelem) ;
+      return ret ;
+   }
+   
 
    ///---------------------------------------------------------------