Changeset 1236 for XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.hpp

Timestamp:

08/04/17 16:03:34 (7 years ago)

Author:

mhnguyen

Message:

Making some changes to allow pools with different number of server

+) Associate context client to each grid distribution (This should be changed in the future)
+) Correct some buffer size estimation
+) Clean some redundant code and add comments

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.hpp (modified) (2 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.hpp

@@ -73 +73 @@
          int getOffsetWrittenIndexes() const;
 
-         std::map<int, StdSize> getAttributesBufferSize();
+         std::map<int, StdSize> getAttributesBufferSize(CContextClient* client);
 
          /// Test ///
@@ -156 +156 @@
          //! True if and only if the data defined on the axis can be outputted in a compressed way
          bool isCompressible_;
-         std::map<int,int> nbConnectedClients_; // Mapping of number of communicating client to a server
-         boost::unordered_map<int, vector<size_t> > indSrv_; // Global index of each client sent to server
-         std::map<int, vector<int> > indWrittenSrv_; // Global written index of each client sent to server
+         std::map<CContextClient*, map<int,int> > nbSenders; // Mapping of number of communicating client to a server
+         std::map<CContextClient*, boost::unordered_map<int, vector<size_t> > > indSrv_; // Global index of each client sent to server
+         // std::map<int, vector<int> > indWrittenSrv_; // Global written index of each client sent to server
          boost::unordered_map<size_t,size_t> globalLocalIndexMap_;
          std::vector<int> indexesToWrite;
          int numberWrittenIndexes_, totalNumberWrittenIndexes_, offsetWrittenIndexes_;
-         std::vector<int> connectedServerRank_;         
+         std::map<CContextClient*, std::vector<int> > connectedServerRank_;         
          bool hasBounds;
          bool hasLabel;