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

merged upstream master

Browse Source
This commit is contained in:
Ed Hartnett 2018-02-16 11:59:13 -07:00
commit 3792348f27
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nc_test4/tst_vars2.c
View File

@ -26,7 +26,7 @@ main(int argc, char **argv)
{ {
int ncid, dimids[NUM_DIMS]; int ncid, dimids[NUM_DIMS];
int varid; int varid;
int nvars_in, varids_in[NUM_VARS]; int nvars_in, varids_in[NUM_VARS] = {0};
signed char fill_value = 42, fill_value_in; signed char fill_value = 42, fill_value_in;
nc_type xtype_in; nc_type xtype_in;
size_t len_in; size_t len_in;
@ -777,6 +777,7 @@ main(int argc, char **argv)
int dimids[NDIMS5], dimids_in[NDIMS5]; int dimids[NDIMS5], dimids_in[NDIMS5];
int varid, varid1, varid2, varid3, varid4; int varid, varid1, varid2, varid3, varid4;
int varids_in4[NVAR4] = {0};
int ndims, nvars, natts, unlimdimid; int ndims, nvars, natts, unlimdimid;
nc_type xtype_in; nc_type xtype_in;
char name_in[NC_MAX_NAME + 1]; char name_in[NC_MAX_NAME + 1];
@ -959,9 +960,9 @@ main(int argc, char **argv)
if (nc_inq(ncid, &ndims, &nvars, &natts, &unlimdimid)) ERR; if (nc_inq(ncid, &ndims, &nvars, &natts, &unlimdimid)) ERR;
if (ndims != NDIMS5 || nvars != NVAR4 || natts != 0 || if (ndims != NDIMS5 || nvars != NVAR4 || natts != 0 ||
unlimdimid != -1) ERR; unlimdimid != -1) ERR;
if (nc_inq_varids(ncid, &nvars, varids_in)) ERR; if (nc_inq_varids(ncid, &nvars, varids_in4)) ERR;
if (nvars != NVAR4) ERR; if (nvars != NVAR4) ERR;
if (varids_in[0] != 0 || varids_in[1] != 1) ERR; if (varids_in4[0] != 0 || varids_in4[1] != 1) ERR;
if (nc_inq_var(ncid, 0, name_in, &xtype_in, &ndims, dimids_in, &natts)) ERR; if (nc_inq_var(ncid, 0, name_in, &xtype_in, &ndims, dimids_in, &natts)) ERR;
if (strcmp(name_in, VAR_NAME5) || xtype_in != NC_INT || ndims != 1 || natts != 0 || if (strcmp(name_in, VAR_NAME5) || xtype_in != NC_INT || ndims != 1 || natts != 0 ||
dimids_in[0] != 0) ERR; dimids_in[0] != 0) ERR;