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
7ec181ee
Commit
7ec181ee
authored
Dec 13, 2012
by
Uwe Schulzweida
Browse files
removed unused function streamDefineTaxis()
parent
01633208
Changes
3
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
7ec181ee
2012-12-1
1
Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
2012-12-1
3
Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* Version 1.5.9 released
* using CGRIBEX library version 1.5.6
2012-12-13 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* removed unused function streamDefineTaxis()
* fix warning in streamDefTimestep() for stream with constant fields only
2012-12-11 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added cdfGridCompress() to compress coordinates
...
...
src/stream.c
View file @
7ec181ee
...
...
@@ -1382,6 +1382,7 @@ int streamDefTimestep(int streamID, int tsID)
int
newtsID
;
int
taxisID
;
int
vlistID
;
int
time_is_varying
;
stream_t
*
streamptr
;
taxis_t
*
taxisptr1
;
taxis_t
*
taxisptr2
;
...
...
@@ -1394,12 +1395,18 @@ int streamDefTimestep(int streamID, int tsID)
stream_check_ptr
(
__func__
,
streamptr
);
vlistID
=
streamInqVlist
(
streamID
);
taxisID
=
vlistInqTaxis
(
vlistID
);
if
(
taxisID
==
CDI_UNDEFID
)
time_is_varying
=
vlistHasTime
(
vlistID
);
if
(
time_is_varying
)
{
Warning
(
"taxisID undefined for fileID = %d! Using absolute time axis."
,
streamID
);
taxisID
=
taxisCreate
(
TAXIS_ABSOLUTE
);
vlistDefTaxis
(
vlistID
,
taxisID
);
taxisID
=
vlistInqTaxis
(
vlistID
);
if
(
taxisID
==
CDI_UNDEFID
)
{
Warning
(
"taxisID undefined for fileID = %d! Using absolute time axis."
,
streamID
);
taxisID
=
taxisCreate
(
TAXIS_ABSOLUTE
);
vlistDefTaxis
(
vlistID
,
taxisID
);
}
}
newtsID
=
tstepsNewEntry
(
streamID
);
...
...
@@ -1409,23 +1416,26 @@ int streamDefTimestep(int streamID, int tsID)
streamptr
->
curTsID
=
tsID
;
taxisptr1
=
taxisPtr
(
taxisID
);
taxisptr2
=
&
streamptr
->
tsteps
[
tsID
].
taxis
;
ptaxisCopy
(
taxisptr2
,
taxisptr1
);
if
(
tsID
==
0
)
if
(
time_is_varying
)
{
if
(
taxisptr1
->
name
)
taxisptr2
->
name
=
taxisptr1
->
name
;
if
(
taxisptr1
->
longname
)
taxisptr2
->
longname
=
taxisptr1
->
longname
;
taxisptr1
=
taxisPtr
(
taxisID
);
taxisptr2
=
&
streamptr
->
tsteps
[
tsID
].
taxis
;
ptaxisCopy
(
taxisptr2
,
taxisptr1
);
if
(
tsID
==
0
)
{
if
(
taxisptr1
->
name
)
taxisptr2
->
name
=
taxisptr1
->
name
;
if
(
taxisptr1
->
longname
)
taxisptr2
->
longname
=
taxisptr1
->
longname
;
}
}
streamptr
->
ntsteps
=
tsID
+
1
;
if
(
namespaceHasLocalFile
(
namespaceGetActive
())
&&
(
streamptr
->
filetype
==
FILETYPE_NC
||
streamptr
->
filetype
==
FILETYPE_NC2
||
streamptr
->
filetype
==
FILETYPE_NC4
||
streamptr
->
filetype
==
FILETYPE_NC4C
)
&&
vlistHasTime
(
vlistID
)
)
if
(
namespaceHasLocalFile
(
namespaceGetActive
())
&&
(
streamptr
->
filetype
==
FILETYPE_NC
||
streamptr
->
filetype
==
FILETYPE_NC2
||
streamptr
->
filetype
==
FILETYPE_NC4
||
streamptr
->
filetype
==
FILETYPE_NC4C
)
&&
time_is_varying
)
cdfDefTimestep
(
streamID
,
tsID
);
cdiCreateRecords
(
streamID
,
tsID
);
...
...
@@ -1665,7 +1675,7 @@ void stream_write_var(int streamID, int varID, int memtype, const void *data, in
stream_check_ptr
(
__func__
,
streamptr
);
streamDefineTaxis
(
streamID
);
//
streamDefineTaxis(streamID);
call not needed
filetype
=
streamptr
->
filetype
;
...
...
src/stream_int.c
View file @
7ec181ee
...
...
@@ -454,7 +454,8 @@ int streamInqFileID(int streamID)
return
(
streamptr
->
fileID
);
}
/* not used anymore */
/*
void streamDefineTaxis(int streamID)
{
stream_t *streamptr;
...
...
@@ -489,7 +490,7 @@ void streamDefineTaxis(int streamID)
Error("time axis undefined");
}
}
*/
void
streamDefDimgroupID
(
int
streamID
,
int
dimgroupID
)
{
...
...
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