Changeset 721 for XIOS/trunk/src/node/grid.cpp

Timestamp:

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

Author:

mhnguyen

Message:

Templated version of distributed hashed table

+) Implement DHT in more generic way to work with different type of information
+) Some old codes of DHT are kept to be a reference (they will be deleted soon)

Test
+) On local, mode attached, 8 processes
+) test_remap passes and result is correct

File:

• XIOS/trunk/src/node/grid.cpp (modified) (2 diffs)

XIOS/trunk/src/node/grid.cpp

@@ -18 +18 @@
 #include "grid_transformation.hpp"
 #include "grid_generate.hpp"
-#include "client_client_dht.hpp"
 
 namespace xios {
@@ -396 +395 @@
                                                             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();