Commit 1b2fe64e authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

cdfInqContents: set all undefined 1D variables to data variables

parent ee754cb0
......@@ -3,6 +3,10 @@
* Version 1.5.6 released
* using CGRIBEX library version 1.5.3
2012-07-04 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdfInqContents: set all undefined 1D variables to data variables [request: Florian Prill]
2012-06-20 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdf_write_var_data: bug fix for unscaled uint8, int8, int16,int32 (bug introduced in 1.5.5)
......
......@@ -5,7 +5,7 @@ Version 1.5.6 (?? ??? 2012):
New features:
Fixed bugs:
* wrong netCDF output for unscaled uint8, int8, int16, int32 (bug introduced in 1.5.5)
* wrong netCDF output for unscaled uint8, int8, int16, int32 variables (bug introduced in 1.5.5)
Version 1.5.5 (15 May 2012):
......
......@@ -6209,7 +6209,7 @@ int cdfInqContents(int streamID)
int ucla_les = FALSE;
streamptr = stream_to_pointer(streamID);
stream_check_ptr(__func__, streamptr);
vlistID = streamInqVlist(streamID);
......@@ -6232,7 +6232,7 @@ int cdfInqContents(int streamID)
Warning("ndims = %d", ndims);
return (CDI_EUFSTRUCT);
}
/* alloc ncvars */
if ( nvars > 0 )
ncvars = (ncvar_t *) malloc(nvars*sizeof(ncvar_t));
......@@ -6365,7 +6365,7 @@ int cdfInqContents(int streamID)
}
else
{
if ( ncvars[ncvarid].isvar != TRUE ) cdfSetVar(ncvars, ncvarid, FALSE);
// if ( ncvars[ncvarid].isvar != TRUE ) cdfSetVar(ncvars, ncvarid, FALSE);
}
// if ( ncvars[ncvarid].isvar != TRUE ) cdfSetVar(ncvars, ncvarid, FALSE);
......@@ -6466,7 +6466,8 @@ int cdfInqContents(int streamID)
if ( ncvars[ncvarid].isvar == -1 && ncvars[ncvarid].ndims == 0 )
cdfSetVar(ncvars, ncvarid, FALSE);
if ( ncvars[ncvarid].isvar == -1 && ncvars[ncvarid].ndims > 1 )
//if ( ncvars[ncvarid].isvar == -1 && ncvars[ncvarid].ndims > 1 )
if ( ncvars[ncvarid].isvar == -1 && ncvars[ncvarid].ndims >= 1 )
cdfSetVar(ncvars, ncvarid, TRUE);
if ( ncvars[ncvarid].isvar == -1 )
......
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