Changeset 584 for XIOS/trunk/src/node/distribution_client.hpp

Timestamp:

04/01/15 17:52:53 (9 years ago)

Author:

mhnguyen

Message:

Implementing new hash algorithm and fixing bug related to zoom

+) Replace boost hash with hash algorithm of Jenkins
+) Domain, if an attribute is non-empty for one client, it should also be non-empty for others inspite of zoom
+) Replace the way to find the number of client connecting to a server to make sure every server receive a message

Test
+) On Curie
+) test_client: passed and results are same like before
+) test_complete: passed, results are partially the same, the different part comes from added working operation

File:

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

XIOS/trunk/src/node/distribution_client.hpp

@@ -37 +37 @@
 
     virtual const CArray<int,1>& getLocalDataIndexOnClient() const;
-    virtual const CArray<int,1>& getLocalDataIndexSendToServerOnClient() const;
+    virtual const CArray<int,1>& getLocalDataIndexSendToServer() const;
+    const CArray<size_t,1>& getGlobalDataIndexSendToServer() const;
 
     std::vector<int> getNGlob() { return nGlob_; }
@@ -45 +46 @@
   protected:
     void createGlobalIndex();
+    void createGlobalIndexSendToServer();
     void readDistributionInfo(CGrid* grid);
     void readDistributionInfo(const std::vector<CDomain*>& domList,
                               const std::vector<CAxis*>& axisList,
                               const CArray<bool,1>& axisDomainOrder);
+    void readDomainIndex(const std::vector<CDomain*>& domList);
+    void readAxisIndex(const std::vector<CAxis*>& axisList);
   private:
     //! Create local index of a domain
@@ -66 +70 @@
   private:
     //!< LocalData index on client
+    CArray<size_t,1>* globalDataSendToServer_;
     CArray<int,1>* localDataIndex_;
     CArray<int,1>* localDataIndexSendToServer_;
@@ -81 +86 @@
     std::vector<int> nZoomBegin_; //!< Begin index of zoom of each dimension
     std::vector<int> nZoomEnd_; //!< End index of zoom of each dimension
+    std::vector<std::vector<CArray<int,2> > > nIndexDomain_; //!< Local index of each domain dimension (e.x: i_index, j_index)
+    std::vector<CArray<int,1> > nIndexAxis_;
 
     // Data_n_index of domain or axis (For now, axis uses its size as data_n_index