test03_get.F (netcdf-fortran-4.4.4) | : | test03_get.F (netcdf-fortran-4.4.5) | ||
---|---|---|---|---|
skipping to change at line 1184 | skipping to change at line 1184 | |||
+ call errore('bad ncid: ', err) | + call errore('bad ncid: ', err) | |||
err = nf_get_vara_text(ncid, BAD_VARID, | err = nf_get_vara_text(ncid, BAD_VARID, | |||
+ start, edge, value) | + start, edge, value) | |||
if (err .ne. NF_ENOTVAR) | if (err .ne. NF_ENOTVAR) | |||
+ call errore('bad var id: ', err) | + call errore('bad var id: ', err) | |||
do 11, j = 1, var_rank(i) | do 11, j = 1, var_rank(i) | |||
if (var_dimid(j,i) .gt. 1) then !/* skip record dim */ | if (var_dimid(j,i) .gt. 1) then !/* skip record dim */ | |||
start(j) = var_shape(j,i) + 1 | start(j) = var_shape(j,i) + 1 | |||
err = nf_get_vara_text(ncid, i, | err = nf_get_vara_text(ncid, i, | |||
+ start, edge, value) | + start, edge, value) | |||
#ifndef NF_RELAX_COORD_BOUND | ||||
if (canConvert .and. err .ne. NF_EINVALCOORDS) | if (canConvert .and. err .ne. NF_EINVALCOORDS) | |||
+ call errore('bad start: ', err) | + call errore('bad start: ', err) | |||
#endif | ||||
start(j) = 1 | start(j) = 1 | |||
endif | endif | |||
11 continue | 11 continue | |||
err = nf_get_vara_text(ncid, i, start, | err = nf_get_vara_text(ncid, i, start, | |||
+ edge, value) | + edge, value) | |||
if (canConvert) then | if (canConvert) then | |||
if (err .ne. 0) | if (err .ne. 0) | |||
+ call error(nf_strerror(err)) | + call error(nf_strerror(err)) | |||
else | else | |||
if (err .ne. NF_ECHAR) | if (err .ne. NF_ECHAR) | |||
skipping to change at line 1377 | skipping to change at line 1379 | |||
+ call errore('bad ncid: ', err) | + call errore('bad ncid: ', err) | |||
err = nf_get_vara_int1(ncid, BAD_VARID, | err = nf_get_vara_int1(ncid, BAD_VARID, | |||
+ start, edge, value) | + start, edge, value) | |||
if (err .ne. NF_ENOTVAR) | if (err .ne. NF_ENOTVAR) | |||
+ call errore('bad var id: ', err) | + call errore('bad var id: ', err) | |||
do 11, j = 1, var_rank(i) | do 11, j = 1, var_rank(i) | |||
if (var_dimid(j,i) .gt. 1) then !/* skip record dim */ | if (var_dimid(j,i) .gt. 1) then !/* skip record dim */ | |||
start(j) = var_shape(j,i) + 1 | start(j) = var_shape(j,i) + 1 | |||
err = nf_get_vara_int1(ncid, i, | err = nf_get_vara_int1(ncid, i, | |||
+ start, edge, value) | + start, edge, value) | |||
#ifndef NF_RELAX_COORD_BOUND | ||||
if (canConvert .and. err .ne. NF_EINVALCOORDS) | if (canConvert .and. err .ne. NF_EINVALCOORDS) | |||
+ call errore('bad start: ', err) | + call errore('bad start: ', err) | |||
#endif | ||||
start(j) = 1 | start(j) = 1 | |||
endif | endif | |||
11 continue | 11 continue | |||
err = nf_get_vara_int1(ncid, i, start, | err = nf_get_vara_int1(ncid, i, start, | |||
+ edge, value) | + edge, value) | |||
if (canConvert) then | if (canConvert) then | |||
if (err .ne. 0) | if (err .ne. 0) | |||
+ call error(nf_strerror(err)) | + call error(nf_strerror(err)) | |||
else | else | |||
if (err .ne. NF_ECHAR) | if (err .ne. NF_ECHAR) | |||
skipping to change at line 1571 | skipping to change at line 1575 | |||
+ call errore('bad ncid: ', err) | + call errore('bad ncid: ', err) | |||
err = nf_get_vara_int2(ncid, BAD_VARID, | err = nf_get_vara_int2(ncid, BAD_VARID, | |||
+ start, edge, value) | + start, edge, value) | |||
if (err .ne. NF_ENOTVAR) | if (err .ne. NF_ENOTVAR) | |||
+ call errore('bad var id: ', err) | + call errore('bad var id: ', err) | |||
do 11, j = 1, var_rank(i) | do 11, j = 1, var_rank(i) | |||
if (var_dimid(j,i) .gt. 1) then !/* skip record dim */ | if (var_dimid(j,i) .gt. 1) then !/* skip record dim */ | |||
start(j) = var_shape(j,i) + 1 | start(j) = var_shape(j,i) + 1 | |||
err = nf_get_vara_int2(ncid, i, | err = nf_get_vara_int2(ncid, i, | |||
+ start, edge, value) | + start, edge, value) | |||
#ifndef NF_RELAX_COORD_BOUND | ||||
if (canConvert .and. err .ne. NF_EINVALCOORDS) | if (canConvert .and. err .ne. NF_EINVALCOORDS) | |||
+ call errore('bad start: ', err) | + call errore('bad start: ', err) | |||
#endif | ||||
start(j) = 1 | start(j) = 1 | |||
endif | endif | |||
11 continue | 11 continue | |||
err = nf_get_vara_int2(ncid, i, start, | err = nf_get_vara_int2(ncid, i, start, | |||
+ edge, value) | + edge, value) | |||
if (canConvert) then | if (canConvert) then | |||
if (err .ne. 0) | if (err .ne. 0) | |||
+ call error(nf_strerror(err)) | + call error(nf_strerror(err)) | |||
else | else | |||
if (err .ne. NF_ECHAR) | if (err .ne. NF_ECHAR) | |||
skipping to change at line 1764 | skipping to change at line 1770 | |||
+ call errore('bad ncid: ', err) | + call errore('bad ncid: ', err) | |||
err = nf_get_vara_int(ncid, BAD_VARID, | err = nf_get_vara_int(ncid, BAD_VARID, | |||
+ start, edge, value) | + start, edge, value) | |||
if (err .ne. NF_ENOTVAR) | if (err .ne. NF_ENOTVAR) | |||
+ call errore('bad var id: ', err) | + call errore('bad var id: ', err) | |||
do 11, j = 1, var_rank(i) | do 11, j = 1, var_rank(i) | |||
if (var_dimid(j,i) .gt. 1) then !/* skip record dim */ | if (var_dimid(j,i) .gt. 1) then !/* skip record dim */ | |||
start(j) = var_shape(j,i) + 1 | start(j) = var_shape(j,i) + 1 | |||
err = nf_get_vara_int(ncid, i, | err = nf_get_vara_int(ncid, i, | |||
+ start, edge, value) | + start, edge, value) | |||
#ifndef NF_RELAX_COORD_BOUND | ||||
if (canConvert .and. err .ne. NF_EINVALCOORDS) | if (canConvert .and. err .ne. NF_EINVALCOORDS) | |||
+ call errore('bad start: ', err) | + call errore('bad start: ', err) | |||
#endif | ||||
start(j) = 1 | start(j) = 1 | |||
endif | endif | |||
11 continue | 11 continue | |||
err = nf_get_vara_int(ncid, i, start, | err = nf_get_vara_int(ncid, i, start, | |||
+ edge, value) | + edge, value) | |||
if (canConvert) then | if (canConvert) then | |||
if (err .ne. 0) | if (err .ne. 0) | |||
+ call error(nf_strerror(err)) | + call error(nf_strerror(err)) | |||
else | else | |||
if (err .ne. NF_ECHAR) | if (err .ne. NF_ECHAR) | |||
skipping to change at line 1956 | skipping to change at line 1964 | |||
+ call errore('bad ncid: ', err) | + call errore('bad ncid: ', err) | |||
err = nf_get_vara_real(ncid, BAD_VARID, | err = nf_get_vara_real(ncid, BAD_VARID, | |||
+ start, edge, value) | + start, edge, value) | |||
if (err .ne. NF_ENOTVAR) | if (err .ne. NF_ENOTVAR) | |||
+ call errore('bad var id: ', err) | + call errore('bad var id: ', err) | |||
do 11, j = 1, var_rank(i) | do 11, j = 1, var_rank(i) | |||
if (var_dimid(j,i) .gt. 1) then !/* skip record dim */ | if (var_dimid(j,i) .gt. 1) then !/* skip record dim */ | |||
start(j) = var_shape(j,i) + 1 | start(j) = var_shape(j,i) + 1 | |||
err = nf_get_vara_real(ncid, i, | err = nf_get_vara_real(ncid, i, | |||
+ start, edge, value) | + start, edge, value) | |||
#ifndef NF_RELAX_COORD_BOUND | ||||
if (canConvert .and. err .ne. NF_EINVALCOORDS) | if (canConvert .and. err .ne. NF_EINVALCOORDS) | |||
+ call errore('bad start: ', err) | + call errore('bad start: ', err) | |||
#endif | ||||
start(j) = 1 | start(j) = 1 | |||
endif | endif | |||
11 continue | 11 continue | |||
err = nf_get_vara_real(ncid, i, start, | err = nf_get_vara_real(ncid, i, start, | |||
+ edge, value) | + edge, value) | |||
if (canConvert) then | if (canConvert) then | |||
if (err .ne. 0) | if (err .ne. 0) | |||
+ call error(nf_strerror(err)) | + call error(nf_strerror(err)) | |||
else | else | |||
if (err .ne. NF_ECHAR) | if (err .ne. NF_ECHAR) | |||
skipping to change at line 2148 | skipping to change at line 2158 | |||
+ call errore('bad ncid: ', err) | + call errore('bad ncid: ', err) | |||
err = nf_get_vara_double(ncid, BAD_VARID, | err = nf_get_vara_double(ncid, BAD_VARID, | |||
+ start, edge, value) | + start, edge, value) | |||
if (err .ne. NF_ENOTVAR) | if (err .ne. NF_ENOTVAR) | |||
+ call errore('bad var id: ', err) | + call errore('bad var id: ', err) | |||
do 11, j = 1, var_rank(i) | do 11, j = 1, var_rank(i) | |||
if (var_dimid(j,i) .gt. 1) then !/* skip record dim */ | if (var_dimid(j,i) .gt. 1) then !/* skip record dim */ | |||
start(j) = var_shape(j,i) + 1 | start(j) = var_shape(j,i) + 1 | |||
err = nf_get_vara_double(ncid, i, | err = nf_get_vara_double(ncid, i, | |||
+ start, edge, value) | + start, edge, value) | |||
#ifndef NF_RELAX_COORD_BOUND | ||||
if (canConvert .and. err .ne. NF_EINVALCOORDS) | if (canConvert .and. err .ne. NF_EINVALCOORDS) | |||
+ call errore('bad start: ', err) | + call errore('bad start: ', err) | |||
#endif | ||||
start(j) = 1 | start(j) = 1 | |||
endif | endif | |||
11 continue | 11 continue | |||
err = nf_get_vara_double(ncid, i, start, | err = nf_get_vara_double(ncid, i, start, | |||
+ edge, value) | + edge, value) | |||
if (canConvert) then | if (canConvert) then | |||
if (err .ne. 0) | if (err .ne. 0) | |||
+ call error(nf_strerror(err)) | + call error(nf_strerror(err)) | |||
else | else | |||
if (err .ne. NF_ECHAR) | if (err .ne. NF_ECHAR) | |||
End of changes. 12 change blocks. | ||||
0 lines changed or deleted | 12 lines changed or added |