Changeset 569 for XIOS/trunk/src/node/domain.cpp

Timestamp:

03/10/15 10:49:13 (9 years ago)

Author:

mhnguyen

Message:

Correct some bugs on discovering server index and do some code cleanings

+) Add some checking functions to make sure mpi_isend and mpi_irecv work correctly
+) Add comments to code
+) Remove some redundant code and comments

Test
+) On Curie
+) The new functions are tested in test_new_features.f90. Test_client and test_complete work like before
+) Test cases:

• 3 dimension grid with: 1 domain, 1 axis
• 3 dimension grid with: 3 axis
• Attached and connected

+) All pass and results are correct

TODO:
+) Fix zoom bug with grid composed of only one axis

File:

• XIOS/trunk/src/node/domain.cpp (modified) (3 diffs)

XIOS/trunk/src/node/domain.cpp

@@ -15 +15 @@
 #include "array_new.hpp"
 #include "server_distribution_description.hpp"
+#include "client_server_mapping_distributed.hpp"
 
 namespace xios {
@@ -667 +668 @@
     int zoom_jend=zoom_jbegin+zoom_nj-1 ;
 
-    std::vector<int> nGlobDomain(2);
-    nGlobDomain[0] = ni_glo.getValue();
-    nGlobDomain[1] = nj_glo.getValue();
-    CServerDistributionDescription serverDescription(nGlobDomain);
-    serverDescription.computeServerDistribution(nbServer, doComputeGlobalIndexServer);
 
     // Precompute number of index
@@ -706 +702 @@
       }
 
-    CClientServerMapping clientServerMap;
-    clientServerMap.computeServerIndexMapping(globalIndexDomain, serverDescription.getGlobalIndex());
-    const std::map<int, std::vector<size_t> >& globalIndexDomainOnServer = clientServerMap.getGlobalIndexOnServer();
+     std::vector<int> nGlobDomain(2);
+     nGlobDomain[0] = ni_glo.getValue();
+     nGlobDomain[1] = nj_glo.getValue();
+     size_t globalSizeIndex = 1, indexBegin, indexEnd;
+     int range, clientSize = client->clientSize;
+     for (int i = 0; i < nGlobDomain.size(); ++i) globalSizeIndex *= nGlobDomain[i];
+     indexBegin = 0;
+     for (int i = 0; i < clientSize; ++i)
+     {
+       range = globalSizeIndex / clientSize;
+       if (i < (globalSizeIndex%clientSize)) ++range;
+       if (i == client->clientRank) break;
+       indexBegin += range;
+     }
+     indexEnd = indexBegin + range - 1;
+
+    CServerDistributionDescription serverDescription(nGlobDomain);
+    serverDescription.computeServerGlobalIndexInRange(nbServer, std::make_pair<size_t,size_t>(indexBegin, indexEnd));
+    CClientServerMapping* clientServerMap = new CClientServerMappingDistributed(serverDescription.getGlobalIndexRange(),
+                                                                                client->intraComm);
+    clientServerMap->computeServerIndexMapping(globalIndexDomain);
+    const std::map<int, std::vector<size_t> >& globalIndexDomainOnServer = clientServerMap->getGlobalIndexOnServer();
     std::vector<int> connectedServerRank;
     for (std::map<int, std::vector<size_t> >::const_iterator it = globalIndexDomainOnServer.begin(); it != globalIndexDomainOnServer.end(); ++it) {
       connectedServerRank.push_back(it->first);
     }
-    nbConnectedClients_ = clientServerMap.computeConnectedClients(client->serverSize, client->clientSize, client->intraComm, connectedServerRank);
+    nbConnectedClients_ = clientServerMap->computeConnectedClients(client->serverSize, client->clientSize, client->intraComm, connectedServerRank);
     indSrv_ = globalIndexDomainOnServer;
+
+    delete clientServerMap;
   }