Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
1b2fe64e
Commit
1b2fe64e
authored
Jul 04, 2012
by
Uwe Schulzweida
Browse files
cdfInqContents: set all undefined 1D variables to data variables
parent
ee754cb0
Changes
3
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
1b2fe64e
...
...
@@ -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)
...
...
NEWS
View file @
1b2fe64e
...
...
@@ -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):
...
...
src/stream_cdf.c
View file @
1b2fe64e
...
...
@@ -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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment