Changeset 47
- Timestamp:
- 09/05/12 12:50:27 (12 years ago)
- Location:
- trunk/NEMOGCM
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/CONFIG/makenemo
r46 r47 280 280 281 281 #- At this stage the configuration has beeen chosen 282 #- We c oose the default light file282 #- We choose the default light file 283 283 export USEBLD=bldxioxag.cfg 284 284 … … 288 288 289 289 #- and test whether we need to build the ioserver 290 # (To put back with the new ioserver) 291 #grep key_iomput ${COMPIL_DIR}/cpp.fcm && export USEBLD=${USEBLD/xio/} 290 grep key_iomput ${COMPIL_DIR}/cpp.fcm && export USEBLD=${USEBLD/xio/} 292 291 293 292 #- -
trunk/NEMOGCM/EXTERNAL/XIOS/src/output/onetcdf4.cpp
r44 r47 32 32 if (comm != NULL) 33 33 { 34 if (!multifile) CheckError(nc_create_par(filename.c_str(), NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, &this->ncidp)); 35 else CheckError(nc_create(filename.c_str(), NC_NETCDF4, &this->ncidp)); 34 if (!multifile) { 35 #ifdef XIOS_NC4_PARALLEL 36 CheckError(nc_create_par(filename.c_str(), NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, &this->ncidp)); 37 #else 38 ERROR("Error: not multifile but ","netcdf4 not compiled with parallel file support"); 39 #endif 40 } else { 41 CheckError(nc_create(filename.c_str(), NC_NETCDF4, &this->ncidp)); 42 } 36 43 } 37 44 else CheckError(nc_create(filename.c_str(), NC_NETCDF4, &this->ncidp)); … … 41 48 if (comm != NULL) 42 49 { 43 if (!multifile) CheckError(nc_open_par(filename.c_str(), NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, &this->ncidp)); 44 else CheckError(nc_open(filename.c_str(), NC_NETCDF4, &this->ncidp)); 50 if (!multifile) { 51 #ifdef XIOS_NC4_PARALLEL 52 CheckError(nc_open_par(filename.c_str(), NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, &this->ncidp)); 53 #else 54 ERROR("Error: not multifile but ","netcdf4 not compiled with parallel file support"); 55 #endif 56 } else { 57 CheckError(nc_open(filename.c_str(), NC_NETCDF4, &this->ncidp)); 58 } 45 59 } 46 60 else CheckError(nc_open(filename.c_str(), NC_NETCDF4, &this->ncidp)); -
trunk/NEMOGCM/EXTERNAL/XIOS/src/output/onetcdf4.hpp
r44 r47 11 11 #define MPI_INCLUDED 12 12 #include <netcdf.h> 13 #ifdef XIOS_NC4_PARALLEL 13 14 extern "C" { 14 15 #include <netcdf_par.h> 15 16 } 17 #endif 16 18 17 19
Note: See TracChangeset
for help on using the changeset viewer.