Changeset 509 for XIOS/trunk/src/node/grid.hpp

Timestamp:

11/13/14 15:09:14 (10 years ago)

Author:

mhnguyen

Message:

Implementing buffer size auto-detection for mode client -server

+) Process xml tree in client side then send all the information to server
+) Only information enabled fields in enabled files are sent to server
+) Some important change in structure of code which must be refactored

Test
+) On Curie
+) Only mode client-server
+) Passed for all tests

File:

• XIOS/trunk/src/node/grid.hpp (modified) (12 diffs)

XIOS/trunk/src/node/grid.hpp

@@ -13 +13 @@
 
 namespace xios {
-   
+
    /// ////////////////////// Déclarations ////////////////////// ///
 
@@ -46 +46 @@
            EVENT_ID_INDEX
          } ;
-         
+
          /// Constructeurs ///
          CGrid(void);
@@ -54 +54 @@
 
          /// Traitements ///
-         void solveReference(void);
+//         void solveReference(void);
+
+         void solveDomainAxisRef(bool areAttributesChecked);
+
+         void checkMaskIndex(bool doCalculateIndex);
 
  //        virtual void toBinary  (StdOStream & os) const;
@@ -74 +78 @@
 
          StdSize getDimension(void) const;
-         
+
 //         StdSize getLocalSize(void) const;
 //         StdSize getGlobalSize(void) const;
@@ -84 +88 @@
          template <int n>
             void inputField(const CArray<double,n>& field, CArray<double,1>& stored) const;
-            
+
          void inputFieldServer(const std::deque< CArray<double, 1>* > storedClient,
                                CArray<double, 1>&  storedServer) const;
@@ -90 +94 @@
          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)  ; 
-   
+         void outputField(int rank, const CArray<double,1>& stored,  CArray<double,1>& field)  ;
+
          /// Destructeur ///
          virtual ~CGrid(void);
@@ -100 +104 @@
          static StdString GetName(void);
          static StdString GetDefName(void);
-         
+
          static ENodeType GetType(void);
 
@@ -115 +119 @@
          void computeIndexServer(void);
          void computeIndex(void);
-         void solveDomainRef(void);
-         void solveAxisRef(void);
+//         void solveDomainRef(void);  //TODO temporarily comment
+//         void solveAxisRef(void);   // TODO: temporarily comment
+
+         void solveDomainRef(bool checkAtt);
+         void solveAxisRef(bool checkAtt);
 
          static bool dispatchEvent(CEventServer& event) ;
@@ -123 +130 @@
          void recvIndex(int rank, CBufferIn& buffer) ;
          void sendIndex(void) ;
-         
+
+         void computeDomConServer();
+         std::map<int, int> getDomConServerSide();
+         std::map<int, StdSize> getConnectedServerDataSize();
       public:
 
@@ -129 +139 @@
          bool withAxis ;
          bool isChecked;
+         bool isDomainAxisChecked;
 
          CAxis*   axis ;
@@ -137 +148 @@
          std::deque< CArray<int, 1>* > out_j_index ;
          std::deque< CArray<int, 1>* > out_l_index ;
-         
+
         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 ;
@@ -148 +159 @@
 //         std::deque<ARRAY(int, 1)> out_j_toSrv ;
 //         std::deque<ARRAY(int, 1)> out_l_toSrv ;
-         
+
          map<int, CArray<int, 1>* > out_i_fromClient ;
          map<int, CArray<int, 1>* > out_j_fromClient ;
          map<int, CArray<int, 1>* > out_l_fromClient ;
          void checkMask(void) ;
+
+         std::map<int, int> domConnectedServerSide_;
+         bool isDomConServerComputed_;
    }; // class CGrid