Changeset 1336 for XIOS/dev/XIOS_DEV_CMIP6/src/node

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/node

Files:

• axis.cpp (modified) (1 diff)
• domain.cpp (modified) (1 diff)

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