Changeset 1129 for XIOS/dev/dev_olga/src/node/domain.hpp

Timestamp:

05/11/17 18:25:20 (7 years ago)

Author:

mhnguyen

Message:

Updating two-level server.
Each client now can play the role of server: It can forward data to other clients or write data like a server.
Each client must combine all data received from other client(s) before forward them or write them on files

+) Correct some bugs of exchange data_index in domain and axis
+) Reorder some functions in context.cpp to make sure that all necessary attributes are available before computing index
+) Add the mapping index for client to write data.

Test
+) On Curie
+) test_client and test_complete
+) Mode:

• Only one level: Correct
• Two levels: Work if using ddt (bug)

+) Only zoom is tested but other transformations should work
+) No reading test

File:

• XIOS/dev/dev_olga/src/node/domain.hpp (modified) (9 diffs)

XIOS/dev/dev_olga/src/node/domain.hpp

@@ -51 +51 @@
            EVENT_ID_INDEX, EVENT_ID_LON, EVENT_ID_LAT, 
            EVENT_ID_AREA, EVENT_ID_MASK,
-           EVENT_ID_DATA_INDEX, EVENT_ID_SERVER_ATTRIBUT
+           EVENT_ID_DATA_INDEX, EVENT_ID_SERVER_ATTRIBUT,
+           EVENT_ID_INDEX_ZOOM
          } ;
 
@@ -106 +107 @@
 
          std::map<int, StdSize> getAttributesBufferSize();
+         CArray<size_t,1> localIndexToWriteOnServer;
 
          bool isEmpty(void) const;
@@ -127 +129 @@
          void completeLonLatClient(void);         
          void computeConnectedClients();
+         void computeWrittenIndex();
 
          void AllgatherRectilinearLonLat(CArray<double,1>& lon, CArray<double,1>& lat,
@@ -138 +141 @@
          static void recvDistributionAttributes(CEventServer& event);
          static void recvIndex(CEventServer& event);
+         static void recvIndexZoom(CEventServer& event);
          static void recvMask(CEventServer& event);
          static void recvZoom(CEventServer& event);
@@ -144 +148 @@
          static void recvArea(CEventServer& event);
          static void recvDataIndex(CEventServer& event);
-         void recvDistributionAttributes(CBufferIn& buffer);         
-         void recvZoom(std::vector<int>& rank, std::vector<CBufferIn*>& buffers);
+         void recvDistributionAttributes(CBufferIn& buffer);                  
          void recvIndex(std::map<int, CBufferIn*>& rankBuffers);
+         void recvIndexZoom(std::map<int, CBufferIn*>& rankBuffers);
          void recvMask(std::map<int, CBufferIn*>& rankBuffers);
          void recvLon(std::map<int, CBufferIn*>& rankBuffers);
@@ -192 +196 @@
          void sendArea();
          void sendLonLat();
-         void sendZoom();
+         void sendIndexZoom();
          void sendDataIndex();
+
+         void convertLonLatValue();
 
        private:         
@@ -202 +208 @@
 
          bool doZoomByIndex_;
-         bool isChecked;
+         bool isChecked, computedWrittenIndex_;
          std::set<StdString> relFiles, relFilesCompressed;
          bool isClientChecked; // Verify whether all attributes of domain on the client side are good
          bool isClientAfterTransformationChecked;
-         std::map<int, CArray<int,1> > indiSrv, indjSrv, indGlob_;
+         std::map<int, CArray<int,1> > indiSrv, indjSrv, indGlob_, indGlobZoom_;
          std::map<int,int> nbConnectedClients_, nbConnectedClientsZoom_; // Mapping of number of communicating client to a server
 
@@ -213 +219 @@
          std::map<int, vector<int> > indWrittenSrv_; // Global written index of each client sent to server
          std::vector<int> indexesToWrite;
-         std::vector<int> recvClientRanks_;
+         std::vector<int> recvClientRanks_, recvClientZoomRanks_;
          int numberWrittenIndexes_, totalNumberWrittenIndexes_, offsetWrittenIndexes_;
-         std::vector<int> connectedServerRank_;
+         std::vector<int> connectedServerRank_, connectedServerZoomRank_;
          bool isDistributed_;
          //! True if and only if the data defined on the domain can be outputted in a compressed way
@@ -222 +228 @@
          TransMapTypes transformationMap_;         
          bool isUnstructed_;
-         boost::unordered_map<size_t,size_t> globalLocalIndexMap_;
+         boost::unordered_map<size_t,size_t> globalLocalIndexMap_, globalLocalIndexZoomMap_;
        
        private: