mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-21 03:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

sync with PnetCDF on use of NC_ENULLSTART and NC_ENULLCOUNT

Browse Source
This commit is contained in:
Wei-keng Liao 2016-11-04 17:29:40 -05:00
parent 5137be27d1
commit e357696c8d
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nc_test/test_get.m4
View File

@ -118,8 +118,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLSTART) else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err)); error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
')dnl ')dnl
@ -363,8 +363,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLSTART) else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err)); error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
err = GetVara($1)(ncid, i, start, NULL, value); err = GetVara($1)(ncid, i, start, NULL, value);
@ -373,8 +373,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLCOUNT) else IF (var_rank[i] > 0 && err != NC_EEDGE)
error("expecting NC_ENULLCOUNT, but got %s", nc_err_code_name(err)); error("expecting NC_EEDGE, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
')dnl ')dnl
@ -575,8 +575,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLSTART) else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err)); error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
err = GetVars($1)(ncid, i, start, NULL, NULL, value); err = GetVars($1)(ncid, i, start, NULL, NULL, value);
@ -585,8 +585,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLCOUNT) else IF (var_rank[i] > 0 && err != NC_EEDGE)
error("expecting NC_ENULLCOUNT, but got %s", nc_err_code_name(err)); error("expecting NC_EEDGE, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
')dnl ')dnl
@ -797,8 +797,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLSTART) else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err)); error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
err = GetVarm($1)(ncid, i, start, NULL, NULL, NULL, value); err = GetVarm($1)(ncid, i, start, NULL, NULL, NULL, value);
@ -807,8 +807,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLCOUNT) else IF (var_rank[i] > 0 && err != NC_EEDGE)
error("expecting NC_ENULLCOUNT, but got %s", nc_err_code_name(err)); error("expecting NC_EEDGE, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
')dnl ')dnl

28
nc_test/test_put.m4
View File

@ -391,8 +391,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLSTART) else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err)); error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
')dnl ')dnl
@ -675,8 +675,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLSTART) else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err)); error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
for (j=0; j<var_rank[i]; j++) start[j] = 0; for (j=0; j<var_rank[i]; j++) start[j] = 0;
@ -686,8 +686,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLCOUNT) else IF (var_rank[i] > 0 && err != NC_EEDGE)
error("expecting NC_ENULLCOUNT, but got %s", nc_err_code_name(err)); error("expecting NC_EEDGE, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
')dnl ')dnl
@ -888,8 +888,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLSTART) else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err)); error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
for (j=0; j<var_rank[i]; j++) start[j] = 0; for (j=0; j<var_rank[i]; j++) start[j] = 0;
@ -899,8 +899,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLCOUNT) else IF (var_rank[i] > 0 && err != NC_EEDGE)
error("expecting NC_ENULLCOUNT, but got %s", nc_err_code_name(err)); error("expecting NC_EEDGE, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
')dnl ')dnl
@ -1101,8 +1101,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLSTART) else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err)); error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
for (j=0; j<var_rank[i]; j++) start[j] = 0; for (j=0; j<var_rank[i]; j++) start[j] = 0;
@ -1112,8 +1112,8 @@ ifdef(`PNETCDF',`dnl
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err)); error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
} }
else IF (var_rank[i] > 0 && err != NC_ENULLCOUNT) else IF (var_rank[i] > 0 && err != NC_EEDGE)
error("expecting NC_ENULLCOUNT, but got %s", nc_err_code_name(err)); error("expecting NC_EEDGE, but got %s", nc_err_code_name(err));
ELSE_NOK ELSE_NOK
')dnl ')dnl