Changeset 1638 for XIOS/trunk/src/node/domain.cpp
- Timestamp:
- 01/22/19 16:15:03 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/node/domain.cpp
r1637 r1638 99 99 \return the number of indexes written by each server 100 100 */ 101 int CDomain::getNumberWrittenIndexes( MPI_Comm writtenCom)101 int CDomain::getNumberWrittenIndexes(ep_lib::MPI_Comm writtenCom) 102 102 TRY 103 103 { 104 104 int writtenSize; 105 MPI_Comm_size(writtenCom, &writtenSize);105 ep_lib::MPI_Comm_size(writtenCom, &writtenSize); 106 106 return numberWrittenIndexes_[writtenSize]; 107 107 } … … 112 112 \return the total number of indexes written by the servers 113 113 */ 114 int CDomain::getTotalNumberWrittenIndexes( MPI_Comm writtenCom)114 int CDomain::getTotalNumberWrittenIndexes(ep_lib::MPI_Comm writtenCom) 115 115 TRY 116 116 { 117 117 int writtenSize; 118 MPI_Comm_size(writtenCom, &writtenSize);118 ep_lib::MPI_Comm_size(writtenCom, &writtenSize); 119 119 return totalNumberWrittenIndexes_[writtenSize]; 120 120 } … … 125 125 \return the offset of indexes written by each server 126 126 */ 127 int CDomain::getOffsetWrittenIndexes( MPI_Comm writtenCom)127 int CDomain::getOffsetWrittenIndexes(ep_lib::MPI_Comm writtenCom) 128 128 TRY 129 129 { 130 130 int writtenSize; 131 MPI_Comm_size(writtenCom, &writtenSize);131 ep_lib::MPI_Comm_size(writtenCom, &writtenSize); 132 132 return offsetWrittenIndexes_[writtenSize]; 133 133 } 134 134 CATCH_DUMP_ATTR 135 135 136 CArray<int, 1>& CDomain::getCompressedIndexToWriteOnServer( MPI_Comm writtenCom)136 CArray<int, 1>& CDomain::getCompressedIndexToWriteOnServer(ep_lib::MPI_Comm writtenCom) 137 137 TRY 138 138 { 139 139 int writtenSize; 140 MPI_Comm_size(writtenCom, &writtenSize);140 ep_lib::MPI_Comm_size(writtenCom, &writtenSize); 141 141 return compressedIndexToWriteOnServer[writtenSize]; 142 142 } … … 690 690 int v ; 691 691 v=ibegin ; 692 MPI_Allgather(&v,1,MPI_INT,ibegin_g,1,MPI_INT,client->intraComm) ;692 ep_lib::MPI_Allgather(&v,1,EP_INT,ibegin_g,1,EP_INT,client->intraComm) ; 693 693 v=jbegin ; 694 MPI_Allgather(&v,1,MPI_INT,jbegin_g,1,MPI_INT,client->intraComm) ;694 ep_lib::MPI_Allgather(&v,1,EP_INT,jbegin_g,1,EP_INT,client->intraComm) ; 695 695 v=ni ; 696 MPI_Allgather(&v,1,MPI_INT,ni_g,1,MPI_INT,client->intraComm) ;696 ep_lib::MPI_Allgather(&v,1,EP_INT,ni_g,1,EP_INT,client->intraComm) ; 697 697 v=nj ; 698 MPI_Allgather(&v,1,MPI_INT,nj_g,1,MPI_INT,client->intraComm) ;699 700 MPI_Allgatherv(lon.dataFirst(),ni,MPI_DOUBLE,lon_g.dataFirst(),ni_g, ibegin_g,MPI_DOUBLE,client->intraComm) ;701 MPI_Allgatherv(lat.dataFirst(),nj,MPI_DOUBLE,lat_g.dataFirst(),nj_g, jbegin_g,MPI_DOUBLE,client->intraComm) ;698 ep_lib::MPI_Allgather(&v,1,EP_INT,nj_g,1,EP_INT,client->intraComm) ; 699 700 ep_lib::MPI_Allgatherv(lon.dataFirst(),ni,EP_DOUBLE,lon_g.dataFirst(),ni_g, ibegin_g,EP_DOUBLE,client->intraComm) ; 701 ep_lib::MPI_Allgatherv(lat.dataFirst(),nj,EP_DOUBLE,lat_g.dataFirst(),nj_g, jbegin_g,EP_DOUBLE,client->intraComm) ; 702 702 703 703 delete[] ibegin_g ; … … 1932 1932 displs[0] = 0; 1933 1933 int localCount = connectedServerRank_[nbServer].size() ; 1934 MPI_Gather(&localCount, 1, MPI_INT, &counts[0], 1, MPI_INT, 0, client->intraComm) ;1934 ep_lib::MPI_Gather(&localCount, 1, EP_INT, &counts[0], 1, EP_INT, 0, client->intraComm) ; 1935 1935 for (int i = 0; i < clientSize-1; ++i) 1936 1936 { … … 1938 1938 } 1939 1939 std::vector<int> allConnectedServers(displs[clientSize-1]+counts[clientSize-1]); 1940 MPI_Gatherv(&(connectedServerRank_[nbServer])[0], localCount, MPI_INT, &allConnectedServers[0], &counts[0], &displs[0], MPI_INT, 0, client->intraComm);1940 ep_lib::MPI_Gatherv(&(connectedServerRank_[nbServer])[0], localCount, EP_INT, &allConnectedServers[0], &counts[0], &displs[0], EP_INT, 0, client->intraComm); 1941 1941 1942 1942 if ((allConnectedServers.size() != nbServer) && (rank == 0)) … … 2003 2003 CATCH_DUMP_ATTR 2004 2004 2005 void CDomain::computeWrittenCompressedIndex( MPI_Comm writtenComm)2005 void CDomain::computeWrittenCompressedIndex(ep_lib::MPI_Comm writtenComm) 2006 2006 TRY 2007 2007 { 2008 2008 int writtenCommSize; 2009 MPI_Comm_size(writtenComm, &writtenCommSize);2009 ep_lib::MPI_Comm_size(writtenComm, &writtenCommSize); 2010 2010 if (compressedIndexToWriteOnServer.find(writtenCommSize) != compressedIndexToWriteOnServer.end()) 2011 2011 return; … … 2064 2064 { 2065 2065 2066 MPI_Allreduce(&numberWrittenIndexes_[writtenCommSize], &totalNumberWrittenIndexes_[writtenCommSize], 1, MPI_INT, MPI_SUM, writtenComm);2067 MPI_Scan(&numberWrittenIndexes_[writtenCommSize], &offsetWrittenIndexes_[writtenCommSize], 1, MPI_INT, MPI_SUM, writtenComm);2066 ep_lib::MPI_Allreduce(&numberWrittenIndexes_[writtenCommSize], &totalNumberWrittenIndexes_[writtenCommSize], 1, EP_INT, EP_SUM, writtenComm); 2067 ep_lib::MPI_Scan(&numberWrittenIndexes_[writtenCommSize], &offsetWrittenIndexes_[writtenCommSize], 1, EP_INT, EP_SUM, writtenComm); 2068 2068 offsetWrittenIndexes_[writtenCommSize] -= numberWrittenIndexes_[writtenCommSize]; 2069 2069 }
Note: See TracChangeset
for help on using the changeset viewer.