Changeset 1638 for XIOS/trunk/src/node/file.cpp
- Timestamp:
- 01/22/19 16:15:03 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/node/file.cpp
r1622 r1638 25 25 CFile::CFile(void) 26 26 : CObjectTemplate<CFile>(), CFileAttributes() 27 , vFieldGroup(), data_out(), enabledFields(), fileComm( MPI_COMM_NULL)27 , vFieldGroup(), data_out(), enabledFields(), fileComm(EP_COMM_NULL) 28 28 , isOpen(false), read_client(0), checkRead(false), allZoneEmpty(false) 29 29 { … … 34 34 CFile::CFile(const StdString & id) 35 35 : CObjectTemplate<CFile>(id), CFileAttributes() 36 , vFieldGroup(), data_out(), enabledFields(), fileComm( MPI_COMM_NULL)36 , vFieldGroup(), data_out(), enabledFields(), fileComm(EP_COMM_NULL) 37 37 , isOpen(false), read_client(0), checkRead(false), allZoneEmpty(false) 38 38 { … … 307 307 308 308 int color = allZoneEmpty ? 0 : 1; 309 MPI_Comm_split(server->intraComm, color, server->intraCommRank, &fileComm);310 if (allZoneEmpty) MPI_Comm_free(&fileComm);309 ep_lib::MPI_Comm_split(server->intraComm, color, server->intraCommRank, &fileComm); 310 if (allZoneEmpty) ep_lib::MPI_Comm_free(&fileComm); 311 311 } 312 312 CATCH_DUMP_ATTR … … 554 554 { 555 555 int commSize, commRank; 556 MPI_Comm_size(fileComm, &commSize);557 MPI_Comm_rank(fileComm, &commRank);556 ep_lib::MPI_Comm_size(fileComm, &commSize); 557 ep_lib::MPI_Comm_rank(fileComm, &commRank); 558 558 559 559 if (server->intraCommSize > 1) … … 634 634 CContext* context = CContext::getCurrent(); 635 635 CContextServer* server = context->server; 636 MPI_Comm readComm = this->fileComm;636 ep_lib::MPI_Comm readComm = this->fileComm; 637 637 638 638 if (!allZoneEmpty) … … 677 677 { 678 678 int commSize, commRank; 679 MPI_Comm_size(readComm, &commSize);680 MPI_Comm_rank(readComm, &commRank);679 ep_lib::MPI_Comm_size(readComm, &commSize); 680 ep_lib::MPI_Comm_rank(readComm, &commRank); 681 681 682 682 if (server->intraCommSize > 1) … … 722 722 isOpen = false; 723 723 } 724 if (fileComm != MPI_COMM_NULL)MPI_Comm_free(&fileComm);724 if (fileComm != EP_COMM_NULL) ep_lib::MPI_Comm_free(&fileComm); 725 725 } 726 726 CATCH_DUMP_ATTR
Note: See TracChangeset
for help on using the changeset viewer.