Skip to content
Snippets Groups Projects
Commit f5939550 authored by WAUTELET Philippe's avatar WAUTELET Philippe
Browse files

Philippe 15/11/2016: suffix for netCDF files is now .nc (instead of .nc4)....

Philippe 15/11/2016: suffix for netCDF files is now .nc (instead of .nc4). This is necessary to respect CF convention.
parent d0bb67c3
No related branches found
No related tags found
No related merge requests found
...@@ -1354,7 +1354,7 @@ END DO ...@@ -1354,7 +1354,7 @@ END DO
outfiles%files(idx)%var_id = ji outfiles%files(idx)%var_id = ji
IF (options(OPTCDF4)%set) THEN IF (options(OPTCDF4)%set) THEN
filename = trim(houtfile)//'.'//trim(tpreclist(ji)%name)//'.nc4' filename = trim(houtfile)//'.'//trim(tpreclist(ji)%name)//'.nc'
status = NF90_CREATE(trim(filename), IOR(NF90_CLOBBER,NF90_NETCDF4), outfiles%files(idx)%lun_id) status = NF90_CREATE(trim(filename), IOR(NF90_CLOBBER,NF90_NETCDF4), outfiles%files(idx)%lun_id)
ELSE ELSE
filename = trim(houtfile)//'.'//trim(tpreclist(ji)%name)//'.nc' filename = trim(houtfile)//'.'//trim(tpreclist(ji)%name)//'.nc'
......
...@@ -257,26 +257,26 @@ IF (ISP == TZFDLFI%OWNER) THEN ...@@ -257,26 +257,26 @@ IF (ISP == TZFDLFI%OWNER) THEN
IF (HACTION == 'READ' .AND. .NOT. LLFIREAD) THEN IF (HACTION == 'READ' .AND. .NOT. LLFIREAD) THEN
!! Open NetCDF File for reading !! Open NetCDF File for reading
TZFDLFI%CDF => NEWIOCDF() TZFDLFI%CDF => NEWIOCDF()
INCERR = NF90_OPEN(ADJUSTL(TRIM(HFILEM))//".nc4", NF90_NOWRITE, TZFDLFI%CDF%NCID) INCERR = NF90_OPEN(ADJUSTL(TRIM(HFILEM))//".nc", NF90_NOWRITE, TZFDLFI%CDF%NCID)
IF (INCERR /= NF90_NOERR) THEN IF (INCERR /= NF90_NOERR) THEN
!PRINT *, 'FMOPEN_ll, NF90_OPEN error : ', NF90_STRERROR(INCERR) !PRINT *, 'FMOPEN_ll, NF90_OPEN error : ', NF90_STRERROR(INCERR)
PRINT *, 'Error in opening (FMOPEN_ll/NF90_OPEN) ', TRIM(HFILEM)//'.nc4', ' : ', NF90_STRERROR(INCERR) PRINT *, 'Error in opening (FMOPEN_ll/NF90_OPEN) ', TRIM(HFILEM)//'.nc', ' : ', NF90_STRERROR(INCERR)
STOP STOP
END IF END IF
PRINT *, 'NF90_OPEN: ', TRIM(HFILEM)//'.nc4' PRINT *, 'NF90_OPEN: ', TRIM(HFILEM)//'.nc'
END IF END IF
IF (HACTION == 'WRITE') THEN IF (HACTION == 'WRITE') THEN
! HACTION == 'WRITE' ! HACTION == 'WRITE'
TZFDLFI%CDF => NEWIOCDF() TZFDLFI%CDF => NEWIOCDF()
INCERR = NF90_CREATE(ADJUSTL(TRIM(HFILEM))//".nc4", & INCERR = NF90_CREATE(ADJUSTL(TRIM(HFILEM))//".nc", &
&IOR(NF90_CLOBBER,NF90_NETCDF4), TZFDLFI%CDF%NCID) &IOR(NF90_CLOBBER,NF90_NETCDF4), TZFDLFI%CDF%NCID)
IF (INCERR /= NF90_NOERR) THEN IF (INCERR /= NF90_NOERR) THEN
!PRINT *, 'FMOPEN_ll, NF90_CREATE error : ', NF90_STRERROR(INCERR) !PRINT *, 'FMOPEN_ll, NF90_CREATE error : ', NF90_STRERROR(INCERR)
PRINT *, 'Error in opening (FMOPEN_ll/NF90_CREATE) ', TRIM(HFILEM)//'.nc4', ' : ', NF90_STRERROR(INCERR) PRINT *, 'Error in opening (FMOPEN_ll/NF90_CREATE) ', TRIM(HFILEM)//'.nc', ' : ', NF90_STRERROR(INCERR)
STOP STOP
END IF END IF
PRINT *, 'NF90_CREATE: ', TRIM(HFILEM)//'.nc4' PRINT *, 'NF90_CREATE: ', TRIM(HFILEM)//'.nc'
END IF END IF
END IF END IF
#endif #endif
......
...@@ -664,29 +664,29 @@ CONTAINS ...@@ -664,29 +664,29 @@ CONTAINS
IF (YACTION == 'READ' .AND. .NOT. LLFIREAD) THEN IF (YACTION == 'READ' .AND. .NOT. LLFIREAD) THEN
! Open NetCDF File for reading ! Open NetCDF File for reading
TZFD_IOZ%CDF => NEWIOCDF() TZFD_IOZ%CDF => NEWIOCDF()
IOSCDF = NF90_OPEN(TRIM(FILE)//cfile//".nc4", NF90_NOWRITE, TZFD_IOZ%CDF%NCID) IOSCDF = NF90_OPEN(TRIM(FILE)//cfile//".nc", NF90_NOWRITE, TZFD_IOZ%CDF%NCID)
IF (IOSCDF /= NF90_NOERR) THEN IF (IOSCDF /= NF90_NOERR) THEN
PRINT *, 'Error in opening (NF90_OPEN) ', TRIM(FILE)//cfile//'.nc4', ' : ', NF90_STRERROR(IOSCDF) PRINT *, 'Error in opening (NF90_OPEN) ', TRIM(FILE)//cfile//'.nc', ' : ', NF90_STRERROR(IOSCDF)
STOP STOP
ELSE ELSE
IOS = 0 IOS = 0
END IF END IF
PRINT *, 'NF90_OPEN(IO_ZSPLIT): ',TRIM(FILE)//cfile//'.nc4' PRINT *, 'NF90_OPEN(IO_ZSPLIT): ',TRIM(FILE)//cfile//'.nc'
END IF END IF
IF (YACTION == 'WRITE') THEN IF (YACTION == 'WRITE') THEN
! YACTION == 'WRITE' ! YACTION == 'WRITE'
! Create NetCDF File for writing ! Create NetCDF File for writing
TZFD_IOZ%CDF => NEWIOCDF() TZFD_IOZ%CDF => NEWIOCDF()
IOSCDF = NF90_CREATE(TRIM(FILE)//cfile//".nc4", & IOSCDF = NF90_CREATE(TRIM(FILE)//cfile//".nc", &
&IOR(NF90_CLOBBER,NF90_NETCDF4), TZFD_IOZ%CDF%NCID) &IOR(NF90_CLOBBER,NF90_NETCDF4), TZFD_IOZ%CDF%NCID)
IF (IOSCDF /= NF90_NOERR) THEN IF (IOSCDF /= NF90_NOERR) THEN
PRINT *, 'Error in opening (NF90_CREATE) ', TRIM(FILE)//cfile//'.nc4', ' : ', NF90_STRERROR(IOSCDF) PRINT *, 'Error in opening (NF90_CREATE) ', TRIM(FILE)//cfile//'.nc', ' : ', NF90_STRERROR(IOSCDF)
STOP STOP
ELSE ELSE
IOS = 0 IOS = 0
END IF END IF
PRINT *, 'NF90_CREATE(IO_ZSPLIT): ',TRIM(FILE)//cfile//'.nc4' PRINT *, 'NF90_CREATE(IO_ZSPLIT): ',TRIM(FILE)//cfile//'.nc'
END IF END IF
END IF END IF
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment