Commit ef7bff78 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

No commit message

No commit message
parent 4064a2f8
......@@ -496,10 +496,10 @@ static void printShortinfo(int streamID, int vlistID, int vardis)
fprintf(stdout, " %-3s", pstr);
if ( vlistInqVarZtype(vlistID, varID) )
fprintf(stdout, "z");
else
if ( vlistInqVarZtype(vlistID, varID) == COMPRESS_NONE )
fprintf(stdout, " ");
else
fprintf(stdout, "z");
fprintf(stdout, "%9d", gridsize);
......
......@@ -3319,6 +3319,7 @@ int cdfInqContents(int streamID)
NCVAR *ncvars;
int vlistID;
STREAM *streamptr;
int format = 0;
streamptr = stream_to_pointer(streamID);
......@@ -3330,6 +3331,10 @@ int cdfInqContents(int streamID)
if ( CDI_Debug )
Message(func, "streamID = %d, fileID = %d", streamID, fileID);
#if defined (NC_NETCDF4)
nc_inq_format(fileID, &format);
#endif
cdf_inq(fileID, &ndims , &nvars, &ngatts, &unlimdimid);
/* alloc ncdims */
......@@ -3517,12 +3522,13 @@ int cdfInqContents(int streamID)
ncvars[ncvarid].ndims = nvdims;
#if defined (NC_NETCDF4)
{
int shuffle, deflate, deflate_level;
nc_inq_var_deflate(fileID, ncvarid, &shuffle, &deflate, &deflate_level);
if ( deflate > 0 )
ncvars[ncvarid].deflate = 1;
}
if ( format == NC_FORMAT_NETCDF4_CLASSIC )
{
int shuffle, deflate, deflate_level;
nc_inq_var_deflate(fileID, ncvarid, &shuffle, &deflate, &deflate_level);
if ( deflate > 0 )
ncvars[ncvarid].deflate = 1;
}
#endif
if ( nvdims > 0 )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment