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
cf5ae652
Commit
cf5ae652
authored
Jan 06, 2013
by
Uwe Schulzweida
Browse files
recordNewEntry: changed parameter streamID to streamptr
parent
1cdefb81
Changes
8
Hide whitespace changes
Inline
Side-by-side
src/stream_cgribex.c
View file @
cf5ae652
...
...
@@ -371,7 +371,7 @@ void cgribexAddRecord(int streamID, int param, int *isec1, int *isec2, double *f
vlistID
=
streamInqVlist
(
streamID
);
tsID
=
streamptr
->
curTsID
;
recID
=
recordNewEntry
(
stream
ID
,
tsID
);
recID
=
recordNewEntry
(
stream
ptr
,
tsID
);
record
=
&
streamptr
->
tsteps
[
tsID
].
records
[
recID
];
tsteptype
=
cgribexGetTsteptype
(
ISEC1_TimeRange
);
...
...
src/stream_ext.c
View file @
cf5ae652
...
...
@@ -284,7 +284,7 @@ void extAddRecord(int streamID, int param, int level, int xysize,
vlistID
=
streamInqVlist
(
streamID
);
tsID
=
streamptr
->
curTsID
;
recID
=
recordNewEntry
(
stream
ID
,
tsID
);
recID
=
recordNewEntry
(
stream
ptr
,
tsID
);
record
=
&
streamptr
->
tsteps
[
tsID
].
records
[
recID
];
(
*
record
).
size
=
recsize
;
...
...
src/stream_gribapi.c
View file @
cf5ae652
...
...
@@ -782,7 +782,7 @@ void gribapiAddRecord(int streamID, int param, grib_handle *gh,
vlistID
=
streamInqVlist
(
streamID
);
tsID
=
streamptr
->
curTsID
;
recID
=
recordNewEntry
(
stream
ID
,
tsID
);
recID
=
recordNewEntry
(
stream
ptr
,
tsID
);
record
=
&
streamptr
->
tsteps
[
tsID
].
records
[
recID
];
tsteptype
=
gribapiGetTsteptype
(
gh
);
...
...
src/stream_ieg.c
View file @
cf5ae652
...
...
@@ -682,7 +682,7 @@ void iegAddRecord(int streamID, int param, int *pdb, int *gdb, double *vct,
vlistID
=
streamInqVlist
(
streamID
);
tsID
=
streamptr
->
curTsID
;
recID
=
recordNewEntry
(
stream
ID
,
tsID
);
recID
=
recordNewEntry
(
stream
ptr
,
tsID
);
record
=
&
streamptr
->
tsteps
[
tsID
].
records
[
recID
];
if
(
IEG_P_LevelType
(
pdb
)
==
IEG_LTYPE_HYBRID_LAYER
)
...
...
src/stream_int.h
View file @
cf5ae652
...
...
@@ -297,7 +297,7 @@ void cdiCheckContents(int streamID);
void
cdiCreateRecords
(
int
streamID
,
int
tsID
);
int
recordNewEntry
(
in
t
stream
ID
,
int
tsID
);
int
recordNewEntry
(
stream_
t
*
stream
ptr
,
int
tsID
);
void
cdiCreateTimesteps
(
int
streamID
);
...
...
src/stream_record.c
View file @
cf5ae652
...
...
@@ -29,14 +29,11 @@ void recordInitEntry(record_t *record)
}
int
recordNewEntry
(
in
t
stream
ID
,
int
tsID
)
int
recordNewEntry
(
stream_
t
*
stream
ptr
,
int
tsID
)
{
int
recordID
=
0
;
int
recordSize
;
record_t
*
records
;
stream_t
*
streamptr
;
streamptr
=
stream_to_pointer
(
streamID
);
recordSize
=
streamptr
->
tsteps
[
tsID
].
recordSize
;
records
=
streamptr
->
tsteps
[
tsID
].
records
;
...
...
src/stream_srv.c
View file @
cf5ae652
...
...
@@ -29,7 +29,7 @@
typedef
struct
{
int
param
;
int
level
;
}
SRVCOMPVAR
;
}
SRVCOMPVAR
;
int
srvInqDatatype
(
int
prec
)
...
...
@@ -75,8 +75,8 @@ int srvInqRecord(int streamID, int *varID, int *levelID)
stream_check_ptr(__func__, streamptr);
vlistID = stream
InqVlist(stream
ID
)
;
fileID = stream
InqFileID(stream
ID
)
;
vlistID = stream
ptr->vlist
ID;
fileID = stream
ptr->file
ID;
srvp = streamptr->record->srvp;
*varID = -1;
...
...
@@ -97,7 +97,7 @@ int srvInqRecord(int streamID, int *varID, int *levelID)
zaxisID = vlistInqVarZaxis(vlistID, *varID);
*levelID = zaxisInqLevelID(zaxisID, (double) ilevel);
return (1);
}
*/
...
...
@@ -119,8 +119,8 @@ int srvReadRecord(int streamID, double *data, int *nmiss)
stream_check_ptr
(
__func__
,
streamptr
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
tsID
=
streamptr
->
curTsID
;
vrecID
=
streamptr
->
tsteps
[
tsID
].
curRecID
;
recID
=
streamptr
->
tsteps
[
tsID
].
recIDs
[
vrecID
];
...
...
@@ -171,8 +171,8 @@ int srvCopyRecord(int streamID2, int streamID1)
stream_check_ptr
(
__func__
,
streamptr1
);
stream_check_ptr
(
__func__
,
streamptr2
);
fileID1
=
stream
InqFileID
(
streamID1
)
;
fileID2
=
stream
InqFileID
(
streamID2
)
;
fileID1
=
stream
ptr1
->
fileID
;
fileID2
=
stream
ptr2
->
fileID
;
tsID
=
streamptr1
->
curTsID
;
vrecID
=
streamptr1
->
tsteps
[
tsID
].
curRecID
;
...
...
@@ -255,7 +255,7 @@ int srvWriteRecord(int streamID, const double *data)
stream_check_ptr
(
__func__
,
streamptr
);
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
srvp
=
streamptr
->
record
->
srvp
;
srvDefDataDP
(
srvp
,
data
);
...
...
@@ -281,9 +281,9 @@ void srvAddRecord(int streamID, int param, int level, int xsize, int ysize,
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
tsID
=
streamptr
->
curTsID
;
recID
=
recordNewEntry
(
stream
ID
,
tsID
);
recID
=
recordNewEntry
(
stream
ptr
,
tsID
);
record
=
&
streamptr
->
tsteps
[
tsID
].
records
[
recID
];
(
*
record
).
size
=
recsize
;
...
...
@@ -292,7 +292,7 @@ void srvAddRecord(int streamID, int param, int level, int xsize, int ysize,
(
*
record
).
ilevel
=
level
;
memset
(
&
grid
,
0
,
sizeof
(
grid_t
));
grid
.
type
=
GRID_GENERIC
;
grid
.
type
=
GRID_GENERIC
;
grid
.
size
=
xsize
*
ysize
;
grid
.
xsize
=
xsize
;
grid
.
ysize
=
ysize
;
...
...
@@ -353,7 +353,7 @@ void srvCmpRecord(int streamID, int tsID, int recID, off_t position, int param,
static
void
srvScanTimestep1
(
int
streamID
)
{
{
int
header
[
8
];
int
prec
=
0
;
int
status
;
...
...
@@ -387,7 +387,7 @@ void srvScanTimestep1(int streamID)
if
(
tsID
!=
0
)
Error
(
"Internal problem! tstepsNewEntry returns %d"
,
tsID
);
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
nrecs
=
0
;
while
(
TRUE
)
...
...
@@ -453,7 +453,7 @@ void srvScanTimestep1(int streamID)
taxis
->
vdate
=
datetime0
.
date
;
taxis
->
vtime
=
datetime0
.
time
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
vlistDefTaxis
(
vlistID
,
taxisID
);
cdiCheckContents
(
streamID
);
...
...
@@ -496,7 +496,7 @@ void srvScanTimestep1(int streamID)
static
int
srvScanTimestep2
(
int
streamID
)
{
{
int
header
[
8
];
int
status
;
int
fileID
;
...
...
@@ -520,8 +520,8 @@ int srvScanTimestep2(int streamID)
streamptr
->
curTsID
=
1
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
srvp
=
streamptr
->
record
->
srvp
;
tsID
=
streamptr
->
rtsteps
;
...
...
@@ -667,12 +667,12 @@ int srvInqContents(int streamID)
stream_check_ptr
(
__func__
,
streamptr
);
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
streamptr
->
curTsID
=
0
;
srvScanTimestep1
(
streamID
);
if
(
streamptr
->
ntsteps
==
-
1
)
status
=
srvScanTimestep2
(
streamID
);
fileSetPos
(
fileID
,
0
,
SEEK_SET
);
...
...
@@ -729,7 +729,7 @@ int srvScanTimestep(int streamID)
for
(
recID
=
0
;
recID
<
nrecs
;
recID
++
)
streamptr
->
tsteps
[
tsID
].
recIDs
[
recID
]
=
streamptr
->
tsteps
[
1
].
recIDs
[
recID
];
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
fileSetPos
(
fileID
,
streamptr
->
tsteps
[
tsID
].
position
,
SEEK_SET
);
...
...
@@ -829,7 +829,7 @@ int srvInqTimestep(int streamID, int tsID)
if
(
CDI_Debug
)
Message
(
"tsID = %d rtsteps = %d"
,
tsID
,
streamptr
->
rtsteps
);
ntsteps
=
UNDEFID
;
while
(
(
tsID
+
1
)
>
streamptr
->
rtsteps
&&
ntsteps
==
UNDEFID
)
ntsteps
=
srvScanTimestep
(
streamID
);
...
...
@@ -864,8 +864,8 @@ void srvReadVarDP(int streamID, int varID, double *data, int *nmiss)
streamptr
=
stream_to_pointer
(
streamID
);
srvp
=
streamptr
->
record
->
srvp
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
nlevs
=
streamptr
->
vars
[
varID
].
nlevs
;
missval
=
vlistInqVarMissval
(
vlistID
,
varID
);
gridID
=
vlistInqVarGrid
(
vlistID
,
varID
);
...
...
@@ -914,8 +914,8 @@ void srvReadVarSliceDP(int streamID, int varID, int levID, double *data, int *nm
streamptr
=
stream_to_pointer
(
streamID
);
srvp
=
streamptr
->
record
->
srvp
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
nlevs
=
streamptr
->
vars
[
varID
].
nlevs
;
missval
=
vlistInqVarMissval
(
vlistID
,
varID
);
gridID
=
vlistInqVarGrid
(
vlistID
,
varID
);
...
...
@@ -968,8 +968,8 @@ void srvWriteVarDP(int streamID, int varID, const double *data)
Message
(
"streamID = %d varID = %d"
,
streamID
,
varID
);
srvp
=
streamptr
->
record
->
srvp
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
tsID
=
streamptr
->
curTsID
;
gridID
=
vlistInqVarGrid
(
vlistID
,
varID
);
gridsize
=
gridInqSize
(
gridID
);
...
...
@@ -1035,8 +1035,8 @@ void srvWriteVarSliceDP(int streamID, int varID, int levID, const double *data)
streamptr
=
stream_to_pointer
(
streamID
);
srvp
=
streamptr
->
record
->
srvp
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
tsID
=
streamptr
->
curTsID
;
gridID
=
vlistInqVarGrid
(
vlistID
,
varID
);
zaxisID
=
vlistInqVarZaxis
(
vlistID
,
varID
);
...
...
src/tsteps.c
View file @
cf5ae652
...
...
@@ -26,6 +26,7 @@ static void tstepsInitEntry(int streamID, int tsID)
ptaxisInit
(
&
streamptr
->
tsteps
[
tsID
].
taxis
);
}
int
tstepsNewEntry
(
int
streamID
)
{
int
tsID
=
0
;
...
...
@@ -64,6 +65,7 @@ int tstepsNewEntry(int streamID)
return
(
tsID
);
}
void
cdiCreateTimesteps
(
int
streamID
)
{
int
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