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
75dfa354
Commit
75dfa354
authored
Jan 16, 2013
by
Uwe Schulzweida
Browse files
stream_cgribex: replaced streamID by streamptr
parent
102737d6
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/stream_cgribex.c
View file @
75dfa354
...
...
@@ -351,7 +351,7 @@ void cgribexGetGrid(stream_t *streamptr, int *isec2, int *isec4, grid_t *grid, i
}
static
void
cgribexAddRecord
(
int
stream
ID
,
int
param
,
int
*
isec1
,
int
*
isec2
,
double
*
fsec2
,
double
*
fsec3
,
void
cgribexAddRecord
(
stream_t
*
stream
ptr
,
int
param
,
int
*
isec1
,
int
*
isec2
,
double
*
fsec2
,
double
*
fsec3
,
int
*
isec4
,
long
recsize
,
off_t
position
,
int
datatype
,
int
comptype
,
int
lmv
,
int
iret
)
{
int
zaxistype
;
...
...
@@ -365,9 +365,6 @@ void cgribexAddRecord(int streamID, int param, int *isec1, int *isec2, double *f
record_t
*
record
;
grid_t
grid
;
int
vlistID
;
stream_t
*
streamptr
;
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
streamptr
->
vlistID
;
tsID
=
streamptr
->
curTsID
;
...
...
@@ -515,7 +512,7 @@ void cgribexDecodeHeader(int *isec0, int *isec1, int *isec2, double *fsec2,
}
#endif
int
cgribexScanTimestep1
(
int
stream
ID
)
int
cgribexScanTimestep1
(
stream_t
*
stream
ptr
)
{
#if defined (HAVE_LIBCGRIBEX)
int
*
isec0
,
*
isec1
,
*
isec2
,
*
isec3
,
*
isec4
;
...
...
@@ -544,14 +541,9 @@ int cgribexScanTimestep1(int streamID)
int
comptype
;
long
unzipsize
;
compvar_t
compVar
,
compVar0
;
stream_t
*
streamptr
;
extern
int
cdiSkipRecords
;
int
nskip
=
cdiSkipRecords
;
streamptr
=
stream_to_pointer
(
streamID
);
stream_check_ptr
(
__func__
,
streamptr
);
streamptr
->
curTsID
=
0
;
isec0
=
streamptr
->
record
->
sec0
;
...
...
@@ -702,7 +694,7 @@ int cgribexScanTimestep1(int streamID)
if
(
CDI_Debug
)
Message
(
"%4d %8d %4d %8d %8d %6d"
,
nrecs
,
(
int
)
recpos
,
param
,
level1
,
vdate
,
vtime
);
cgribexAddRecord
(
stream
ID
,
param
,
isec1
,
isec2
,
fsec2
,
fsec3
,
cgribexAddRecord
(
stream
ptr
,
param
,
isec1
,
isec2
,
fsec2
,
fsec3
,
isec4
,
recsize
,
recpos
,
datatype
,
comptype
,
lmv
,
iret
);
}
...
...
@@ -778,7 +770,7 @@ int cgribexScanTimestep1(int streamID)
}
int
cgribexScanTimestep2
(
int
stream
ID
)
int
cgribexScanTimestep2
(
stream_t
*
stream
ptr
)
{
int
rstatus
=
0
;
#if defined (HAVE_LIBCGRIBEX)
...
...
@@ -804,11 +796,6 @@ int cgribexScanTimestep2(int streamID)
int
vlistID
;
long
unzipsize
;
compvar_t
compVar
,
compVar0
;
stream_t
*
streamptr
;
streamptr
=
stream_to_pointer
(
streamID
);
stream_check_ptr
(
__func__
,
streamptr
);
streamptr
->
curTsID
=
1
;
...
...
@@ -1055,7 +1042,7 @@ int cgribexScanTimestep2(int streamID)
}
int
cgribexScanTimestep
(
int
stream
ID
)
int
cgribexScanTimestep
(
stream_t
*
stream
ptr
)
{
int
rstatus
=
0
;
#if defined (HAVE_LIBCGRIBEX)
...
...
@@ -1080,17 +1067,12 @@ int cgribexScanTimestep(int streamID)
int
rindex
,
nrecs
=
0
;
long
unzipsize
;
compvar_t
compVar
,
compVar0
;
stream_t
*
streamptr
;
streamptr
=
stream_to_pointer
(
streamID
);
stream_check_ptr
(
__func__
,
streamptr
);
vlistID
=
streamptr
->
vlistID
;
if
(
CDI_Debug
)
{
Message
(
"stream
ID
= %
d
"
,
stream
ID
);
Message
(
"stream
ptr
= %
p
"
,
stream
ptr
);
Message
(
"cts = %d"
,
streamptr
->
curTsID
);
Message
(
"rts = %d"
,
streamptr
->
rtsteps
);
Message
(
"nts = %d"
,
streamptr
->
ntsteps
);
...
...
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