Changeset 720 for XIOS/trunk/src/node

Timestamp:

10/06/15 17:17:10 (9 years ago)

Author:

mhnguyen

Message:

First implementation of hierarchical distributed hashed table

+) Implement dht for int with index of type size_t

Test
+) Local
+) Work correctly

Location:

XIOS/trunk/src/node

Files:

• domain.cpp (modified) (1 diff)
• grid.cpp (modified) (3 diffs)

XIOS/trunk/src/node/domain.cpp

@@ -272 +272 @@
         fillInRectilinearLonLat();
         this->isRedistributed_ = true;
-        info <<"now, we are here " << std::endl;
-        info << "domain " << this->getId() << " ni " << ni.getValue() << " nj " << nj.getValue() << std::endl;
      }
    }

XIOS/trunk/src/node/grid.cpp

@@ -18 +18 @@
 #include "grid_transformation.hpp"
 #include "grid_generate.hpp"
+#include "client_client_dht.hpp"
 
 namespace xios {
@@ -158 +159 @@
    /*!
     * Test whether the data defined on the grid can be outputted in a compressed way.
-    * 
+    *
     * \return true if and only if a mask was defined for this grid
     */
@@ -395 +396 @@
                                                             clientDistribution_->isDataDistributed());
 
+     CClientClientDHT clientDht(serverDistributionDescription.getGlobalIndexRange(),
+                                client->intraComm,
+                                clientDistribution_->isDataDistributed());
+     clientDht.computeServerIndexMapping(clientDistribution_->getGlobalIndex());
+     const std::map<int, std::vector<size_t> >& globalIndexOnServer0 = clientDht.getGlobalIndexOnServer();
+
+     std::map<int, std::vector<size_t> >::const_iterator itbTmp, itTmp, iteTmp;
+     itbTmp = globalIndexOnServer0.begin(); iteTmp = globalIndexOnServer0.end();
+     for (itTmp = itbTmp; itTmp != iteTmp; ++itTmp)
+     {
+       const std::vector<size_t>& tmpVec = itTmp->second; info << "tmpVec0. Rank " << itTmp->first << ". Size = " << tmpVec.size() << ". "  ;
+       for (int i = 0; i < tmpVec.size(); ++i) info << tmpVec[i] << " ";
+       info << std::endl;
+     }
+//
      clientServerMap_->computeServerIndexMapping(clientDistribution_->getGlobalIndex());
      const std::map<int, std::vector<size_t> >& globalIndexOnServer = clientServerMap_->getGlobalIndexOnServer();
+
+     itbTmp = globalIndexOnServer.begin(); iteTmp = globalIndexOnServer.end();
+     for (itTmp = itbTmp; itTmp != iteTmp; ++itTmp)
+     {
+       const std::vector<size_t>& tmpVec = itTmp->second; info << "tmpVec1. Rank " << itTmp->first << ". Size = " << tmpVec.size() << ". "  ;
+       for (int i = 0; i < tmpVec.size(); ++i) info << tmpVec[i] << " ";
+       info << std::endl;
+     }
+
      const std::vector<size_t>& globalIndexSendToServer = clientDistribution_->getGlobalDataIndexSendToServer();
      std::map<int, std::vector<size_t> >::const_iterator iteGlobalMap, itbGlobalMap, itGlobalMap;