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
96421425
Commit
96421425
authored
Jan 13, 2013
by
Uwe Schulzweida
Browse files
stream_cdf: changed argument type of stream from int to stream_t
parent
f0dc1e2c
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
src/stream.c
View file @
96421425
...
...
@@ -1626,7 +1626,7 @@ void streamReadVar(int streamID, int varID, double *data, int *nmiss)
case
FILETYPE_NC4
:
case
FILETYPE_NC4C
:
{
cdfReadVarDP
(
stream
ID
,
varID
,
data
,
nmiss
);
cdfReadVarDP
(
stream
ptr
,
varID
,
data
,
nmiss
);
break
;
}
#endif
...
...
@@ -1850,7 +1850,7 @@ void streamReadVarSlice(int streamID, int varID, int levelID, double *data, int
case
FILETYPE_NC4C
:
{
/* FIXME: status value ignored */
int
ierr
=
cdfReadVarSliceDP
(
stream
ID
,
varID
,
levelID
,
data
,
nmiss
);
int
ierr
=
cdfReadVarSliceDP
(
stream
ptr
,
varID
,
levelID
,
data
,
nmiss
);
break
;
}
#endif
...
...
@@ -1921,7 +1921,7 @@ void stream_write_var_slice(int streamID, int varID, int levelID, int memtype, c
{
int
ierr
=
0
;
if
(
streamptr
->
accessmode
==
0
)
cdfEndDef
(
streamID
);
ierr
=
cdf_write_var_slice
(
stream
ID
,
varID
,
levelID
,
memtype
,
data
,
nmiss
);
ierr
=
cdf_write_var_slice
(
stream
ptr
,
varID
,
levelID
,
memtype
,
data
,
nmiss
);
break
;
}
#endif
...
...
@@ -2214,15 +2214,14 @@ void streamDefVlist(int streamID, int vlistID)
vlistDefVarMissval
(
streamptr
->
vlistID
,
varID
,
vlistInqVarMissval
(
vlistID
,
varID
));
}
if
(
namespaceHasLocalFile
(
namespaceGetActive
())
&&
streamptr
->
filemode
==
'w'
)
if
(
namespaceHasLocalFile
(
namespaceGetActive
())
&&
streamptr
->
filemode
==
'w'
)
{
if
(
streamptr
->
filetype
==
FILETYPE_NC
||
streamptr
->
filetype
==
FILETYPE_NC2
||
streamptr
->
filetype
==
FILETYPE_NC4
||
streamptr
->
filetype
==
FILETYPE_NC4C
)
{
cdfDefVars
(
stream
ID
);
cdfDefVars
(
stream
ptr
);
}
else
if
(
streamptr
->
filetype
==
FILETYPE_GRB
||
streamptr
->
filetype
==
FILETYPE_GRB2
)
...
...
src/stream_cdf.c
View file @
96421425
This diff is collapsed.
Click to expand it.
src/stream_cdf.h
View file @
96421425
#ifndef _STREAM_CDF_H
#define _STREAM_CDF_H
void
cdfDefVars
(
in
t
stream
ID
);
void
cdfDefVars
(
stream_
t
*
stream
ptr
);
void
cdfDefTimestep
(
stream_t
*
streamptr
,
int
tsID
);
int
cdfInqTimestep
(
int
streamID
,
int
tsID
);
int
cdfInqContents
(
int
streamID
);
...
...
@@ -12,16 +12,16 @@ void cdfInqHistoryString(int streamID, char *history);
void
cdfEndDef
(
int
streamID
);
int
cdfDefRecord
(
int
streamID
);
int
cdfCopyRecord
(
in
t
stream
IDdest
,
in
t
stream
IDsrc
);
int
cdfCopyRecord
(
stream_
t
*
stream
ptr2
,
stream_
t
*
stream
ptr1
);
int
cdfReadRecord
(
in
t
stream
ID
,
double
*
data
,
int
*
nmiss
);
void
cdf_write_record
(
in
t
stream
ID
,
int
memtype
,
const
void
*
data
,
int
nmiss
);
int
cdfReadRecord
(
stream_
t
*
stream
ptr
,
double
*
data
,
int
*
nmiss
);
void
cdf_write_record
(
stream_
t
*
stream
ptr
,
int
memtype
,
const
void
*
data
,
int
nmiss
);
void
cdfReadVarDP
(
in
t
stream
ID
,
int
varID
,
double
*
data
,
int
*
nmiss
);
void
cdfReadVarDP
(
stream_
t
*
stream
ptr
,
int
varID
,
double
*
data
,
int
*
nmiss
);
void
cdf_write_var
(
int
streamID
,
int
varID
,
int
memtype
,
const
void
*
data
,
int
nmiss
);
int
cdfReadVarSliceDP
(
in
t
stream
ID
,
int
varID
,
int
levelID
,
double
*
data
,
int
*
nmiss
);
int
cdf_write_var_slice
(
in
t
stream
ID
,
int
varID
,
int
levelID
,
int
memtype
,
const
void
*
data
,
int
nmiss
);
int
cdfReadVarSliceDP
(
stream_
t
*
stream
ptr
,
int
varID
,
int
levelID
,
double
*
data
,
int
*
nmiss
);
int
cdf_write_var_slice
(
stream_
t
*
stream
ptr
,
int
varID
,
int
levelID
,
int
memtype
,
const
void
*
data
,
int
nmiss
);
#endif
/*
...
...
src/stream_record.c
View file @
96421425
...
...
@@ -340,7 +340,7 @@ void streamReadRecord(int streamID, double *data, int *nmiss)
case
FILETYPE_NC4
:
case
FILETYPE_NC4C
:
{
status
=
cdfReadRecord
(
stream
ID
,
data
,
nmiss
);
status
=
cdfReadRecord
(
stream
ptr
,
data
,
nmiss
);
break
;
}
#endif
...
...
@@ -408,7 +408,7 @@ void stream_write_record(int streamID, int memtype, const void *data, int nmiss)
case
FILETYPE_NC4
:
case
FILETYPE_NC4C
:
{
cdf_write_record
(
stream
ID
,
memtype
,
data
,
nmiss
);
cdf_write_record
(
stream
ptr
,
memtype
,
data
,
nmiss
);
break
;
}
#endif
...
...
@@ -483,7 +483,7 @@ void streamCopyRecord(int streamID2, int streamID1)
#endif
default:
{
status
=
cdfCopyRecord
(
stream
ID
2
,
stream
ID
1
);
status
=
cdfCopyRecord
(
stream
ptr
2
,
stream
ptr
1
);
break
;
}
}
...
...
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