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

XIOS/trunk/src/node/grid.hpp

@@ -9 +9 @@
 #include "domain.hpp"
 #include "axis.hpp"
+#include "array_new.hpp"
+#include "attribute_array.hpp"
 
 namespace xios {
@@ -54 +56 @@
          void solveReference(void);
 
-         virtual void toBinary  (StdOStream & os) const;
-         virtual void fromBinary(StdIStream & is);
+ //        virtual void toBinary  (StdOStream & os) const;
+//         virtual void fromBinary(StdIStream & is);
 
          /// Tests ///
@@ -63 +65 @@
 
          /// Accesseurs ///
-         const std::deque<ARRAY(int, 1)> & getStoreIndex(void) const;
-         const std::deque<ARRAY(int, 1)> & getOutIIndex(void)  const;
-         const std::deque<ARRAY(int, 1)> & getOutJIndex(void)  const;
-         const std::deque<ARRAY(int, 1)> & getOutLIndex(void)  const;
+         const std::deque< CArray<int, 1>* > & getStoreIndex(void) const;
+         const std::deque< CArray<int, 1>* > & getOutIIndex(void)  const;
+         const std::deque< CArray<int, 1>* > & getOutJIndex(void)  const;
+         const std::deque< CArray<int, 1>* > & getOutLIndex(void)  const;
 
          const CAxis*   getRelAxis  (void) const;
@@ -80 +82 @@
 
          /// Entrées-sorties de champs ///
-         template <StdSize n>
-            void inputField(const ARRAY(double, n) field, ARRAY(double, 1) stored) const;
+         template <int n>
+            void inputField(const CArray<double,n>& field, CArray<double,1>& stored) const;
             
-         void inputFieldServer(const std::deque<ARRAY(double, 1)> storedClient,
-                                                ARRAY(double, 1)  storedServer) const;
-/*
-         template <StdSize n>
-            void outputField(const ARRAY(double, 1) stored,  ARRAY(double, n) field) const;
-*/
-         void outputField(int rank, const ARRAY(double, 1) stored,  ARRAY(double, 3) field)  ;
-         void outputField(int rank, const ARRAY(double, 1) stored,  ARRAY(double, 2) field)  ;
-         void outputField(int rank,const ARRAY(double, 1) stored,  ARRAY(double, 1) field)  ; 
+         void inputFieldServer(const std::deque< CArray<double, 1>* > storedClient,
+                               CArray<double, 1>&  storedServer) const;
+
+         void outputField(int rank, const CArray<double,1>& stored,  CArray<double,3>& field)  ;
+         void outputField(int rank, const CArray<double,1>& stored,  CArray<double,2>& field)  ;
+         void outputField(int rank, const CArray<double,1>& stored,  CArray<double,1>& field)  ; 
    
          /// Destructeur ///
@@ -111 +110 @@
 
          /// Entrées-sorties de champs (interne) ///
-         void storeField_arr(const double * const data, ARRAY(double, 1) stored) const;
+         void storeField_arr(const double * const data, CArray<double,1>& stored) const;
 
          /// Traitements protégés ///
@@ -120 +119 @@
 
          static bool dispatchEvent(CEventServer& event) ;
-         void outputFieldToServer(ARRAY(double, 1) fieldIn, int rank, ARRAY(double, 1) fieldOut) ;
+         void outputFieldToServer(CArray<double,1>& fieldIn, int rank, CArray<double,1>& fieldOut) ;
          static void recvIndex(CEventServer& event) ;
          void recvIndex(int rank, CBufferIn& buffer) ;
@@ -134 +133 @@
          CDomain* domain ;
 
-         std::deque<ARRAY(int, 1)> storeIndex ;
-         std::deque<ARRAY(int, 1)> out_i_index ;
-         std::deque<ARRAY(int, 1)> out_j_index ;
-         std::deque<ARRAY(int, 1)> out_l_index ;
-         ARRAY(int, 1) storeIndex_client ;
-         ARRAY(int, 1) out_i_client ;
-         ARRAY(int, 1) out_j_client ;
-         ARRAY(int, 1) out_l_client ;
+         std::deque< CArray<int, 1>* > storeIndex ;
+         std::deque< CArray<int, 1>* > out_i_index ;
+         std::deque< CArray<int, 1>* > out_j_index ;
+         std::deque< CArray<int, 1>* > out_l_index ;
          
-         map<int,ARRAY(int, 1)>  storeIndex_toSrv ;
+        CArray<int, 1>  storeIndex_client ;
+        CArray<int, 1>  out_i_client ;
+        CArray<int, 1>  out_j_client ;
+        CArray<int, 1>  out_l_client ;
+         
+         map<int, CArray<int, 1>* >  storeIndex_toSrv ;
          map<int,int> nbSenders ;
 //         std::deque<ARRAY(int, 1)> out_i_toSrv ;
@@ -149 +149 @@
 //         std::deque<ARRAY(int, 1)> out_l_toSrv ;
          
-         map<int,ARRAY(int, 1)> out_i_fromClient ;
-         map<int,ARRAY(int, 1)> out_j_fromClient ;
-         map<int,ARRAY(int, 1)> out_l_fromClient ;
+         map<int, CArray<int, 1>* > out_i_fromClient ;
+         map<int, CArray<int, 1>* > out_j_fromClient ;
+         map<int, CArray<int, 1>* > out_l_fromClient ;
          
    }; // class CGrid
@@ -157 +157 @@
    ///--------------------------------------------------------------
 
-   template <StdSize n>
-      void CGrid::inputField(const  ARRAY(double, n) field, ARRAY(double, 1) stored) const
+   template <int n>
+      void CGrid::inputField(const CArray<double,n>& field, CArray<double,1>& stored) const
    {
-      if (this->getDataSize() != field->num_elements())
-         ERROR("CGrid::inputField(const  ARRAY(double, n) field, ARRAY(double, 1) stored)",
+      if (this->getDataSize() != field.numElements())
+         ERROR("void CGrid::inputField(const  CArray<double,n>& field, CArray<double,1>& stored) const",
                 << "[ Taille des données attendue = " << this->getDataSize()       << ", "
-                << "Taille des données reçue = "      << field->num_elements() << " ] "
+                << "Taille des données reçue = "      << field.numElements() << " ] "
                 << "Le tableau de données n'a pas la bonne taille !") ;
-      this->storeField_arr(field->data(), stored) ;
+      this->storeField_arr(field.dataFirst(), stored) ;
    }