Changeset 860 for XIOS/trunk/src/client_client_dht_template.hpp

Timestamp:

06/09/16 11:32:01 (8 years ago)

Author:

mhnguyen

Message:

Improvement of DHT: allow multiple values correspond to one key

+) If there are several returned values corresponding to one key,
all of them are returned by DHT in vector.

Test
+) Testing only very basic. This commit serves as temporary one.

File:

• XIOS/trunk/src/client_client_dht_template.hpp (modified) (4 diffs)

XIOS/trunk/src/client_client_dht_template.hpp

@@ -36 +36 @@
     typedef typename boost::unordered_map<InfoType, std::vector<size_t> > InfoType2IndexMap;
     typedef typename boost::unordered_map<size_t,InfoType> Index2InfoTypeMap;
+    typedef typename boost::unordered_map<size_t,std::vector<InfoType> > Index2VectorInfoTypeMap;
 
   public:
@@ -41 +42 @@
                              const MPI_Comm& clientIntraComm);
 
+    CClientClientDHTTemplate(const Index2VectorInfoTypeMap& indexInfoInitMap,
+                             const MPI_Comm& clientIntraComm);
+
     void computeIndexInfoMapping(const CArray<size_t,1>& indices);
 
-    const Index2InfoTypeMap& getInfoIndexMap() const {return indexToInfoMappingLevel_; }
+//    const Index2InfoTypeMap& getInfoIndexMap() const {return indexToInfoMappingLevel_; }
+    const Index2VectorInfoTypeMap& getInfoIndexMap() const {return indexToInfoMappingLevel_; }
 
     int getNbClient() { return nbClient_; }
@@ -55 +60 @@
                                  const MPI_Comm& intraCommLevel,
                                  int level);
+
+    void computeDistributedIndex(const Index2VectorInfoTypeMap& indexInfoInitMap,
+                                 const MPI_Comm& intraCommLevel,
+                                 int level);
+
 
     void computeHashIndex(std::vector<size_t>& indexClientHash, int nbClient);
@@ -92 +102 @@
   protected:
     //! Mapping of global index to the corresponding client
-    Index2InfoTypeMap index2InfoMapping_;
+//    Index2InfoTypeMap index2InfoMapping_;
+    Index2VectorInfoTypeMap index2InfoMapping_;
 
     //! A mapping of index to the corresponding information in each level of hierarchy
-    Index2InfoTypeMap indexToInfoMappingLevel_;
+//    Index2InfoTypeMap indexToInfoMappingLevel_;
+    Index2VectorInfoTypeMap indexToInfoMappingLevel_;
 
     std::vector<std::vector<int> > sendRank_;