Changeset 1336 for XIOS/dev/XIOS_DEV_CMIP6/src/client_server_mapping_distributed.cpp

Timestamp:

11/20/17 16:29:55 (6 years ago)

Author:

oabramkina

Message:

Changes in case of different number of processes per secondary-server pool.

No incorrect behaviour had been found in the previous versions; this commit is just to play safe.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/client_server_mapping_distributed.cpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/client_server_mapping_distributed.cpp

@@ -35 +35 @@
    Compute mapping global index of server which client sends to.
    \param [in] globalIndexOnClient global index client has
+   \param [in] nbServer size of server's intracomm
 */
-void CClientServerMappingDistributed::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient)
+void CClientServerMappingDistributed::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient, int nbServer)
 {
-  CContext* context=CContext::getCurrent() ;
-//  CContextClient* client=context->client ;
-  // For now the assumption is that secondary server pools consist of the same number of procs.
-  // CHANGE the line below if the assumption changes.
-  CContextClient* client = (0 != context->clientPrimServer.size()) ? context->clientPrimServer[0] : context->client;
-  int nbServer=client->serverSize;
 
   ccDHT_->computeIndexInfoMapping(globalIndexOnClient);