mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-23 16:59:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gdsjaar-patch-1' into dynamic-patch

Browse Source
This commit is contained in:
Ward Fisher 2015-11-12 14:15:32 -07:00
commit e1807c800e
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libdispatch/dvar.c
View File

@ -346,13 +346,24 @@ NC_inq_recvar(int ncid, int varid, int* nrecdimsp, int *is_recdim)
#ifdef USE_NETCDF4
{
int nunlimdims;
int unlimids[NC_MAX_DIMS];
int *unlimids;
int recdim;
status = nc_inq_unlimdims(ncid, &nunlimdims, unlimids); /* for group or file, not variable */
status = nc_inq_unlimdims(ncid, &nunlimdims, NULL); /* for group or file, not variable */
if(status != NC_NOERR) return status;
if(nunlimdims == 0) return status;
if (!(unlimids = malloc(nunlimdims * sizeof(int))))
return NC_ENOMEM;
status = nc_inq_unlimdims(ncid, &nunlimdims, unlimids); /* for group or file, not variable */
if(status != NC_NOERR) {
free(unlimids);
return status;
}
status = nc_inq_vardimid(ncid, varid, dimset);
if(status != NC_NOERR) return status;
if(status != NC_NOERR) {
free(unlimids);
return status;
}
for (dim = 0; dim < nvardims; dim++) { /* netCDF-4 rec dims need not be first dim for a rec var */
for(recdim = 0; recdim < nunlimdims; recdim++) {
if(dimset[dim] == unlimids[recdim]) {
@ -361,6 +372,7 @@ NC_inq_recvar(int ncid, int varid, int* nrecdimsp, int *is_recdim)
}
}
}
free(unlimids);
}
#else
status = nc_inq_vardimid(ncid, varid, dimset);