test_read.F (netcdf-fortran-4.4.4) | : | test_read.F (netcdf-fortran-4.4.5) | ||
---|---|---|---|---|
skipping to change at line 83 | skipping to change at line 83 | |||
data msg(23) | data msg(23) | |||
+ / 'NetCDF: nc_rec op when there are no record vars' / | + / 'NetCDF: nc_rec op when there are no record vars' / | |||
data msg(24) | data msg(24) | |||
+ /'NetCDF: Attempt to convert between text & numbers'/ | + /'NetCDF: Attempt to convert between text & numbers'/ | |||
data msg(25) / 'NetCDF: Start+count exceeds dimension bound' / | data msg(25) / 'NetCDF: Start+count exceeds dimension bound' / | |||
data msg(26) / 'NetCDF: Illegal stride' / | data msg(26) / 'NetCDF: Illegal stride' / | |||
data msg(27) / 'NetCDF: Name contains illegal characters' / | data msg(27) / 'NetCDF: Name contains illegal characters' / | |||
C /* Try on a bad error status */ | C /* Try on a bad error status */ | |||
message = nf_strerror(-666)!/* should fail */ | message = nf_strerror(-666)!/* should fail */ | |||
if (message .ne. 'Unknown Error') | if (message(1:13) .ne. 'Unknown Error') | |||
+ call errorc('nf_strerror on bad error status returned: ', | + call errorc('nf_strerror on bad error status returned: ', | |||
+ message) | + message) | |||
C /* Try on each legitimate error status */ | C /* Try on each legitimate error status */ | |||
do 1, i=1, number_of_messages | do 1, i=1, number_of_messages | |||
message = nf_strerror(status(i)) | message = nf_strerror(status(i)) | |||
if (message .ne. msg(i)) | if (message .ne. msg(i)) | |||
+ call error('nf_strerror() should return "' // msg(i) // | + call error('nf_strerror() should return "' // msg(i) // | |||
+ '"') | + '"') | |||
1 continue | 1 continue | |||
skipping to change at line 481 | skipping to change at line 481 | |||
err = nf_inq_format(BAD_ID, nformat) | err = nf_inq_format(BAD_ID, nformat) | |||
if (err .ne. NF_EBADID) | if (err .ne. NF_EBADID) | |||
+ call errore('bad ncid: ', err) | + call errore('bad ncid: ', err) | |||
err = nf_open(testfile, NF_NOWRITE, ncid) | err = nf_open(testfile, NF_NOWRITE, ncid) | |||
if (err .ne. 0) | if (err .ne. 0) | |||
+ call errore('nf_open: ', err) | + call errore('nf_open: ', err) | |||
err = nf_inq_format(ncid, nformat) | err = nf_inq_format(ncid, nformat) | |||
if (err .ne. 0) then | if (err .ne. 0) then | |||
call errore('nf_inq_format: ', err) | call errore('nf_inq_format: ', err) | |||
else if (nformat .ne. nf_format_classic .and. | else if (nformat .ne. nf_format_classic .and. | |||
#ifdef ENABLE_CDF5 | ||||
+ nformat .ne. nf_format_cdf5 .and. | ||||
#endif | ||||
#ifdef USE_NETCDF4 | ||||
+ nformat .ne. nf_format_netcdf4 .and. | ||||
#endif | ||||
+ nformat .ne. nf_format_64bit) then | + nformat .ne. nf_format_64bit) then | |||
call errori('nf_inq_format: wrong format number returned, ', | call errori('nf_inq_format: wrong format number returned, ', | |||
+ nformat) | + nformat) | |||
end if | end if | |||
err = nf_close(ncid) | err = nf_close(ncid) | |||
if (err .ne. 0) | if (err .ne. 0) | |||
+ call errore('nf_close: ', err) | + call errore('nf_close: ', err) | |||
end | end | |||
subroutine test_nf_inq_dimid() | subroutine test_nf_inq_dimid() | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 7 lines changed or added |