Changeset 300 for XMLIO_V2/dev/common/src/node/grid.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/node/grid.hpp (modified) (5 diffs)

XMLIO_V2/dev/common/src/node/grid.hpp

@@ -41 +41 @@
          typedef CGridGroup      RelGroup;
 
+         enum EEventId
+         {
+           EVENT_ID_INDEX
+         } ;
+         
          /// Constructeurs ///
          CGrid(void);
@@ -81 +86 @@
          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)  ; 
+   
          /// Destructeur ///
          virtual ~CGrid(void);
@@ -102 +111 @@
             CreateGrid(boost::shared_ptr<CDomain> domain, boost::shared_ptr<CAxis> axis);
 
-      protected :
+      public :
 
          /// Entrées-sorties de champs (interne) ///
@@ -113 +122 @@
          void solveAxisRef(void);
 
+         static bool dispatchEvent(CEventServer& event) ;
+         void outputFieldToServer(ARRAY(double, 1) fieldIn, int rank, ARRAY(double, 1) fieldOut) ;
+         static void recvIndex(CEventServer& event) ;
+         void recvIndex(int rank, CBufferIn& buffer) ;
+         void sendIndex(void) ;
+         
       public:
 
@@ -126 +141 @@
          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 ;
+         
+         map<int,ARRAY(int, 1)>  storeIndex_toSrv ;
+         map<int,int> nbSenders ;
+//         std::deque<ARRAY(int, 1)> out_i_toSrv ;
+//         std::deque<ARRAY(int, 1)> out_j_toSrv ;
+//         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 ;
+         
    }; // class CGrid