Changeset 1336 for XIOS

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.

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• client_server_mapping.hpp (modified) (1 diff)
• client_server_mapping_distributed.cpp (modified) (1 diff)
• client_server_mapping_distributed.hpp (modified) (1 diff)
• node/axis.cpp (modified) (1 diff)
• node/domain.cpp (modified) (1 diff)
• transformation/domain_algorithm_interpolate.cpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/client_server_mapping.hpp

@@ -34 +34 @@
 
     // Only need global index on client to calculate mapping (supposed client has info of distribution)
-    virtual void computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient) = 0;
+    virtual void computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient, int nbServer) = 0;
 
     static std::map<int,int> computeConnectedClients(int nbServer, int nbClient,

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);

XIOS/dev/XIOS_DEV_CMIP6/src/client_server_mapping_distributed.hpp

@@ -38 +38 @@
                                     bool isDataDistributed = true);
 
-    virtual void computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClientSendToServer);
+    virtual void computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClientSendToServer, int nbServer);
 
     /** Default destructor */

XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp

@@ -603 +603 @@
       // Find out the connection between client and server side
       CClientServerMapping* clientServerMap = new CClientServerMappingDistributed(serverDescription.getGlobalIndexRange(), client->intraComm);
-      clientServerMap->computeServerIndexMapping(globalIndex);
+      clientServerMap->computeServerIndexMapping(globalIndex, nbServer);
       CClientServerMapping::GlobalIndexMap& globalIndexAxisOnServer = clientServerMap->getGlobalIndexOnServer();      
 

XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp

@@ -1844 +1844 @@
       CClientServerMapping* clientServerMap = new CClientServerMappingDistributed(serverDescription.getGlobalIndexRange(),
                                                                                   client->intraComm);
-      clientServerMap->computeServerIndexMapping(globalIndexDomain);
+      clientServerMap->computeServerIndexMapping(globalIndexDomain, nbServer);
       CClientServerMapping::GlobalIndexMap& globalIndexDomainOnServer = clientServerMap->getGlobalIndexOnServer();
 

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/domain_algorithm_interpolate.cpp

@@ -564 +564 @@
   }
 
-  domainIndexClientClientMapping.computeServerIndexMapping(globalIndexInterp);
+  domainIndexClientClientMapping.computeServerIndexMapping(globalIndexInterp, client->serverSize);
   const CClientServerMapping::GlobalIndexMap& globalIndexInterpSendToClient = domainIndexClientClientMapping.getGlobalIndexOnServer();