Changeset 352 for XIOS/trunk/src/array.hpp

Timestamp:

07/09/12 11:33:05 (12 years ago)

Author:

ymipsl

Message:

 

File:

• XIOS/trunk/src/array.hpp (modified) (4 diffs)

XIOS/trunk/src/array.hpp

@@ -16 +16 @@
 {
    template<size_t numDims>
-   detail::multi_array::extent_gen<numDims> getExtentNull(void) { return getExtentNull<numDims-1>()[0];}
+   inline detail::multi_array::extent_gen<numDims> getExtentNull(void) { return getExtentNull<numDims-1>()[0];}
    
    template<>
-   detail::multi_array::extent_gen<1> getExtentNull<1>(void) { return extents[0]; }
+   inline detail::multi_array::extent_gen<1> getExtentNull<1>(void) { return extents[0]; }
 
    /// ////////////////////// Déclarations ////////////////////// ///
-   template <typename ValueType, StdSize  NumDims,
-             typename Allocator = std::allocator<ValueType> >
-      class CArray
-         : public boost::multi_array<ValueType, NumDims, Allocator>
+   
+   template <typename ValueType, StdSize  NumDims, typename Allocator = std::allocator<ValueType> >
+   class CArray : public boost::multi_array<ValueType, NumDims, Allocator>
    {
          /// Définition de type ///
@@ -35 +34 @@
 
          /// Constructeurs ///
-         template <typename ExtentList>
-            explicit CArray(const ExtentList & sizes);
+//         template <typename ExtentList>
+//            explicit CArray(const ExtentList & sizes);
+      template <typename ExtentList> CArray(const ExtentList & sizes)
+            : boost::multi_array<ValueType, NumDims, Allocator>
+                  (sizes, boost::fortran_storage_order())
+   { /* Ne rien faire de plus */ }
+
 
          explicit CArray();
 
-         template <typename ExtentList>
-            CArray(const ExtentList & sizes, const boost::general_storage_order<NumDims> & store);
+//         template <typename ExtentList>
+//            CArray(const ExtentList & sizes, const boost::general_storage_order<NumDims> & store);
+      template <typename ExtentList>  CArray(const ExtentList & sizes, const boost::general_storage_order<NumDims> & store)
+               : boost::multi_array<ValueType, NumDims, Allocator> (sizes, store)
+   { /* Ne rien faire de plus */ }
 
          CArray(const CArray & array);       // NEVER IMPLEMENTED.
@@ -71 +78 @@
 
    }; // class CArray
-   
 
    ///---------------------------------------------------------------
@@ -77 +83 @@
 } // namespace xios
 
-#include "array_impl.hpp"
+//#include "array_impl.hpp"
 #include "array_mac.hpp"
-
+namespace xios
+{
+   template <typename ValueType> void FromBinary(StdIStream & is, ARRAY(ValueType, 1) & array) ;
+   template <typename ValueType> void FromBinary(StdIStream & is, ARRAY(ValueType, 2) & array) ;
+   template <typename ValueType> void FromBinary(StdIStream & is, ARRAY(ValueType, 3) & array) ;
+}
 #endif // __XMLIO_CArray__