Changeset 1787
- Timestamp:
- 12/13/19 17:55:14 (5 years ago)
- Location:
- XIOS/dev/dev_ym/XIOS_COUPLING/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.cpp
r1784 r1787 93 93 // A condition to make sure that if there is only one client, axis 94 94 // should be considered to be distributed. This should be a temporary solution 95 distributed |= (1 == CContext::getCurrent()-> client->clientSize);95 distributed |= (1 == CContext::getCurrent()->intraCommSize_); 96 96 return distributed; 97 97 } -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp
r1784 r1787 227 227 (!i_index.isEmpty() && i_index.numElements() == ni_glo*nj_glo)); 228 228 bool distributed_glo ; 229 distributed |= (1 == CContext::getCurrent()-> client->clientSize);229 distributed |= (1 == CContext::getCurrent()->intraCommSize_); 230 230 231 231 return distributed; -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp
r1784 r1787 1352 1352 CContext* context = CContext::getCurrent(); 1353 1353 { 1354 CContextClient* client = context->client; 1355 1356 int rank = client->clientRank; 1354 int rank = context->intraCommRank_; 1357 1355 1358 1356 clientDistribution_ = new CDistributionClient(rank, this); -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm_interpolate.cpp
r1785 r1787 562 562 { 563 563 CContext* context = CContext::getCurrent(); 564 CContextClient* client=context->client;565 int clientRank = client->clientRank;564 int clientRank = context->intraCommRank_; 565 int nbClient = context-> intraCommSize_; 566 566 567 567 this->transformationMapping_.resize(1); … … 587 587 588 588 CClientServerMappingDistributed domainIndexClientClientMapping(globalIndexOfDomainDest, 589 c lient->intraComm,589 context->intraComm_, 590 590 true); 591 591 CArray<size_t,1> globalIndexInterp(interpMapValue.size()); … … 599 599 } 600 600 601 domainIndexClientClientMapping.computeServerIndexMapping(globalIndexInterp, client->clientSize);601 domainIndexClientClientMapping.computeServerIndexMapping(globalIndexInterp, nbClient); 602 602 const CClientServerMapping::GlobalIndexMap& globalIndexInterpSendToClient = domainIndexClientClientMapping.getGlobalIndexOnServer(); 603 603 604 604 //Inform each client number of index they will receive 605 int nbClient = client->clientSize;606 605 int* sendBuff = new int[nbClient]; 607 606 int* recvBuff = new int[nbClient]; … … 628 627 629 628 630 MPI_Allreduce(sendBuff, recvBuff, nbClient, MPI_INT, MPI_SUM, c lient->intraComm);629 MPI_Allreduce(sendBuff, recvBuff, nbClient, MPI_INT, MPI_SUM, context->intraComm_); 631 630 632 631 int* sendIndexDestBuff = new int [sendBuffSize]; … … 661 660 itMap->first, 662 661 MPI_DOMAIN_INTERPOLATION_DEST_INDEX, 663 c lient->intraComm,662 context->intraComm_, 664 663 &sendRequest.back()); 665 664 sendRequest.push_back(MPI_Request()); … … 669 668 itMap->first, 670 669 MPI_DOMAIN_INTERPOLATION_SRC_INDEX, 671 c lient->intraComm,670 context->intraComm_, 672 671 &sendRequest.back()); 673 672 sendRequest.push_back(MPI_Request()); … … 677 676 itMap->first, 678 677 MPI_DOMAIN_INTERPOLATION_WEIGHT, 679 c lient->intraComm,678 context->intraComm_, 680 679 &sendRequest.back()); 681 680 sendOffSet += k; … … 696 695 MPI_ANY_SOURCE, 697 696 MPI_DOMAIN_INTERPOLATION_DEST_INDEX, 698 c lient->intraComm,697 context->intraComm_, 699 698 &recvStatus); 700 699 … … 708 707 clientSrcRank, 709 708 MPI_DOMAIN_INTERPOLATION_SRC_INDEX, 710 c lient->intraComm,709 context->intraComm_, 711 710 &recvStatus); 712 711 … … 716 715 clientSrcRank, 717 716 MPI_DOMAIN_INTERPOLATION_WEIGHT, 718 c lient->intraComm,717 context->intraComm_, 719 718 &recvStatus); 720 719
Note: See TracChangeset
for help on using the changeset viewer.