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
22acc7ba
Commit
22acc7ba
authored
Sep 02, 2013
by
Uwe Schulzweida
Browse files
streamCopyRecord: allow mixed netCDF file types
parent
17f5f4b4
Changes
2
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
22acc7ba
...
...
@@ -3,6 +3,10 @@
* Version 1.6.2 released
* using CGRIBEX library version 1.6.2
2013-09-02 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* streamCopyRecord: allow mixed netCDF file types
2013-08-26 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* gribapiDefLevel: Bug fix for ZAXIS_REFERENCE (Bug #3747)
...
...
src/stream_record.c
View file @
22acc7ba
...
...
@@ -459,6 +459,28 @@ void streamCopyRecord(int streamID2, int streamID1)
if
(
filetype1
==
filetype2
)
filetype
=
filetype2
;
else
{
switch
(
filetype1
)
{
case
FILETYPE_NC
:
case
FILETYPE_NC2
:
case
FILETYPE_NC4
:
case
FILETYPE_NC4C
:
switch
(
filetype2
)
{
case
FILETYPE_NC
:
case
FILETYPE_NC2
:
case
FILETYPE_NC4
:
case
FILETYPE_NC4C
:
Warning
(
"Streams have different file types (%s -> %s)!"
,
strfiletype
(
filetype1
),
strfiletype
(
filetype2
));
filetype
=
filetype2
;
break
;
}
break
;
}
}
if
(
filetype
==
CDI_UNDEFID
)
Error
(
"Streams have different file types (%s -> %s)!"
,
strfiletype
(
filetype1
),
strfiletype
(
filetype2
));
switch
(
filetype
)
...
...
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