Changeset 1134 for XIOS/dev/branch_yushan_merged/src/io/onetcdf4.cpp
- Timestamp:
- 05/16/17 17:54:30 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/branch_yushan_merged/src/io/onetcdf4.cpp
r1097 r1134 3 3 #include "onetcdf4.hpp" 4 4 #include "group_template.hpp" 5 #include "mpi.hpp"6 5 #include "netcdf.hpp" 7 6 #include "netCdfInterface.hpp" … … 12 11 /// ////////////////////// Définitions ////////////////////// /// 13 12 14 CONetCDF4::CONetCDF4(const StdString& filename, bool append, bool useClassicFormat, 15 bool useCFConvention, 16 const MPI_Comm* comm, bool multifile, const StdString& timeCounterName) 13 CONetCDF4::CONetCDF4(const StdString& filename, bool append, bool useClassicFormat, bool useCFConvention, 14 const ep_lib::MPI_Comm* comm, bool multifile, const StdString& timeCounterName) 17 15 : path() 18 16 , wmpi(false) … … 32 30 33 31 void CONetCDF4::initialize(const StdString& filename, bool append, bool useClassicFormat, bool useCFConvention, 34 const MPI_Comm* comm, bool multifile, const StdString& timeCounterName)32 const ep_lib::MPI_Comm* comm, bool multifile, const StdString& timeCounterName) 35 33 { 36 34 this->useClassicFormat = useClassicFormat; … … 56 54 { 57 55 if (wmpi) 58 CNetCdfInterface::createPar(filename, mode, *comm, MPI_INFO_NULL, this->ncidp);56 CNetCdfInterface::createPar(filename, mode, static_cast<MPI_Comm>(comm->mpi_comm), MPI_INFO_NULL_STD, this->ncidp); 59 57 else 60 58 CNetCdfInterface::create(filename, mode, this->ncidp); … … 66 64 mode |= NC_WRITE; 67 65 if (wmpi) 68 CNetCdfInterface::openPar(filename, mode, *comm, MPI_INFO_NULL, this->ncidp);66 CNetCdfInterface::openPar(filename, mode, static_cast<MPI_Comm>(comm->mpi_comm), MPI_INFO_NULL_STD, this->ncidp); 69 67 else 70 68 CNetCdfInterface::open(filename, mode, this->ncidp); … … 535 533 const std::vector<StdSize>& scount, const int* data) 536 534 { 537 CNetCdfInterface::putVaraType(grpid, varid, &sstart[0], &scount[0], data); 538 } 535 CNetCdfInterface::putVaraType(grpid, varid, &sstart[0], &scount[0], data); 536 } 537 539 538 //--------------------------------------------------------------- 540 539 … … 544 543 const std::vector<StdSize>& scount, const float* data) 545 544 { 546 545 CNetCdfInterface::putVaraType(grpid, varid, &sstart[0], &scount[0], data); 547 546 } 548 547
Note: See TracChangeset
for help on using the changeset viewer.