Changeset 610 for XIOS/branchs/xios-1.0/src/node/domain.hpp

Timestamp:

06/10/15 10:39:10 (9 years ago)

Author:

rlacroix

Message:

Domain initialization: Reduce communications and simplify the code.

File:

• XIOS/branchs/xios-1.0/src/node/domain.hpp (modified) (8 diffs)

XIOS/branchs/xios-1.0/src/node/domain.hpp

@@ -15 +15 @@
 
 namespace xios {
-   
+
    /// ////////////////////// Déclarations ////////////////////// ///
 
@@ -39 +39 @@
            EVENT_ID_SERVER_ATTRIBUT, EVENT_ID_LON_LAT
          } ;
-         
+
          /// typedef ///
          typedef CObjectTemplate<CDomain>   SuperClass;
@@ -68 +68 @@
          void checkDomainData(void);
          void checkCompression(void);
-         
+
          void checkZoom(void);
          void checkBounds(void);
@@ -74 +74 @@
 
       public :
-      
+
          /// Autres ///
 
@@ -84 +84 @@
          bool hasZoom(void) const;
          bool isEmpty(void) const;
-         
-         
+
+
          int ni_client,ibegin_client,iend_client ;
          int zoom_ni_client,zoom_ibegin_client,zoom_iend_client ;
@@ -100 +100 @@
          CArray<double, 1> lonvalue_srv, latvalue_srv ;
          CArray<double, 2> bounds_lon_srv, bounds_lat_srv ;
-         
-         
-        vector<int> connectedServer ; // list of connected server 
+
+
+        vector<int> connectedServer ; // list of connected server
         vector<int> nbSenders ; // for each communication with a server, number of communicating client
-        vector<int> nbDataSrv ; // size of data to send to each server 
+        vector<int> nbDataSrv ; // size of data to send to each server
         vector< vector<int> > i_indSrv ; // for each server, i global index to send
         vector< vector<int> > j_indSrv ; // for each server, j global index to send
-       
+
         CArray<int,2> mapConnectedServer ;  // (ni,nj) => mapped to connected server number, -1 if no server is target
-               
+
 //        vector<int> ib_srv, ie_srv, in_srv ;
 //        vector<int> jb_srv, je_srv, jn_srv ;
-         
+
       public :
-      
+
          /// Mutateur ///
          void addRelFile(const StdString & filename);
          void completeLonLatClient(void);
-         void sendServerAttribut(void) ;
-         void sendLonLat(void) ;
-         void computeConnectedServer(void) ;
-         static bool dispatchEvent(CEventServer& event) ;
-         static void recvLonLat(CEventServer& event) ;
-         static void recvServerAttribut(CEventServer& event) ;
-         void recvLonLat(CBufferIn& buffer) ;
-         void recvServerAttribut(CBufferIn& buffer) ;
-         
+         void sendServerAttribut(void);
+         void sendLonLat(void);
+         void computeConnectedServer(void);
+         static bool dispatchEvent(CEventServer& event);
+         static void recvServerAttribut(CEventServer& event);
+         static void recvLonLat(CEventServer& event);
+         void recvServerAttribut(CBufferIn& buffer);
+         void recvLonLat(int rank, CBufferIn& buffer);
+
          /// Destructeur ///
          virtual ~CDomain(void);
@@ -133 +133 @@
          static StdString GetName(void);
          static StdString GetDefName(void);
-         
+
          static ENodeType GetType(void);
 
@@ -144 +144 @@
          bool isChecked;
          std::set<StdString> relFiles;
+         std::map<int, CArray<int,1> > indiSrv, indjSrv;
 
    }; // class CDomain