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
941834bd
Commit
941834bd
authored
Jan 09, 2013
by
Uwe Schulzweida
Browse files
inline streamInqFileID()
parent
1fe39c35
Changes
12
Hide whitespace changes
Inline
Side-by-side
doc/Doxyfile
View file @
941834bd
...
...
@@ -597,7 +597,7 @@ RECURSIVE = YES
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = cfortran.h
EXCLUDE =
src/
cfortran.h
src/cdilib.c
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix filesystem feature) are excluded
...
...
src/stream.c
View file @
941834bd
...
...
@@ -593,7 +593,7 @@ int cdiInqContents(int streamID)
if
(
status
==
0
)
{
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
taxisID
=
vlistInqTaxis
(
vlistID
);
if
(
taxisID
!=
-
1
)
{
...
...
@@ -1324,7 +1324,7 @@ void streamSync(int streamID)
fileID
=
streamptr
->
fileID
;
filetype
=
streamptr
->
filetype
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
nvars
=
vlistNvars
(
vlistID
);
if
(
fileID
==
CDI_UNDEFID
)
...
...
@@ -1394,7 +1394,7 @@ int streamDefTimestep(int streamID, int tsID)
stream_check_ptr
(
__func__
,
streamptr
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
time_is_varying
=
vlistHasTime
(
vlistID
);
...
...
@@ -1436,7 +1436,7 @@ int streamDefTimestep(int streamID, int tsID)
streamptr
->
filetype
==
FILETYPE_NC4
||
streamptr
->
filetype
==
FILETYPE_NC4C
)
&&
time_is_varying
)
cdfDefTimestep
(
stream
ID
,
tsID
);
cdfDefTimestep
(
stream
ptr
,
tsID
);
cdi_create_records
(
streamptr
,
tsID
);
...
...
@@ -1472,7 +1472,7 @@ int streamInqTimestep(int streamID, int tsID)
stream_check_ptr
(
__func__
,
streamptr
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
if
(
tsID
<
streamptr
->
rtsteps
)
{
...
...
@@ -1686,7 +1686,7 @@ void stream_write_var(int streamID, int varID, int memtype, const void *data, in
case
FILETYPE_GRB2
:
{
if
(
memtype
==
MEMTYPE_FLOAT
)
Error
(
"grbWriteVar not implemented for memtype float!"
);
grbWriteVarDP
(
stream
ID
,
varID
,
data
,
nmiss
);
grbWriteVarDP
(
stream
ptr
,
varID
,
data
,
nmiss
);
break
;
}
#endif
...
...
@@ -1885,7 +1885,7 @@ void stream_write_var_slice(int streamID, int varID, int levelID, int memtype, c
case
FILETYPE_GRB2
:
{
if
(
memtype
==
MEMTYPE_FLOAT
)
Error
(
"grbWriteVarSlice not implemented for memtype float!"
);
grbWriteVarSliceDP
(
stream
ID
,
varID
,
levelID
,
data
,
nmiss
);
grbWriteVarSliceDP
(
stream
ptr
,
varID
,
levelID
,
data
,
nmiss
);
break
;
}
#endif
...
...
@@ -1999,7 +1999,7 @@ void streamWriteContents(int streamID, char *cname)
stream_check_ptr
(
__func__
,
streamptr
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
cnp
=
fopen
(
cname
,
"w"
);
...
...
src/stream_cdf.c
View file @
941834bd
...
...
@@ -591,8 +591,8 @@ void cdfWriteGridTraj(int streamID, int gridID)
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
gridindex
=
vlistGridIndex
(
vlistID
,
gridID
);
lonID
=
streamptr
->
xdimID
[
gridindex
];
...
...
@@ -621,8 +621,8 @@ void cdfReadGridTraj(int streamID, int gridID)
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
gridindex
=
vlistGridIndex
(
vlistID
,
gridID
);
lonID
=
streamptr
->
xdimID
[
gridindex
];
...
...
@@ -710,8 +710,8 @@ void cdfDefVarMissval(int streamID, int varID, int dtype, int lcheck)
int
vlistID
;
int
xtype
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
ncvarid
=
streamptr
->
vars
[
varID
].
ncvarid
;
missval
=
vlistInqVarMissval
(
vlistID
,
varID
);
if
(
lcheck
&&
streamptr
->
ncmode
==
2
)
cdf_redef
(
fileID
);
...
...
@@ -772,7 +772,7 @@ int cdfReadRecord(int streamID, double *data, int *nmiss)
}
static
void
cdfDefTimeValue
(
in
t
stream
ID
,
int
tsID
)
void
cdfDefTimeValue
(
stream_
t
*
stream
ptr
,
int
tsID
)
{
#if defined (HAVE_LIBNETCDF)
int
fileID
;
...
...
@@ -780,11 +780,8 @@ void cdfDefTimeValue(int streamID, int tsID)
int
ncvarid
;
size_t
index
;
taxis_t
*
taxis
;
stream_t
*
streamptr
;
streamptr
=
stream_to_pointer
(
streamID
);
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
if
(
CDI_Debug
)
Message
(
"streamID = %d, fileID = %d"
,
streamID
,
fileID
);
...
...
@@ -826,7 +823,7 @@ printf("fileID = %d %d %d %f\n", fileID, time_varid, index, timevalue);
}
static
void
cdfDefTime
(
in
t
stream
ID
)
void
cdfDefTime
(
stream_
t
*
stream
ptr
)
{
#if defined (HAVE_LIBNETCDF)
int
fileID
;
...
...
@@ -841,13 +838,10 @@ void cdfDefTime(int streamID)
char
*
taxis_name
=
default_name
;
size_t
len
;
taxis_t
*
taxis
;
stream_t
*
streamptr
;
streamptr
=
stream_to_pointer
(
streamID
);
if
(
streamptr
->
basetime
.
ncvarid
!=
UNDEFID
)
return
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
if
(
streamptr
->
ncmode
==
0
)
streamptr
->
ncmode
=
1
;
...
...
@@ -957,15 +951,15 @@ void cdfDefTime(int streamID)
}
void
cdfDefTimestep
(
in
t
stream
ID
,
int
tsID
)
void
cdfDefTimestep
(
stream_
t
*
stream
ptr
,
int
tsID
)
{
int
vlistID
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
if
(
vlistHasTime
(
vlistID
)
)
cdfDefTime
(
stream
ID
);
if
(
vlistHasTime
(
vlistID
)
)
cdfDefTime
(
stream
ptr
);
cdfDefTimeValue
(
stream
ID
,
tsID
);
cdfDefTimeValue
(
stream
ptr
,
tsID
);
}
#if defined (HAVE_LIBNETCDF)
...
...
@@ -984,8 +978,8 @@ void cdfDefComplex(int streamID, int gridID)
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
ngrids
=
vlistNgrids
(
vlistID
);
...
...
@@ -1039,8 +1033,8 @@ void cdfDefSP(int streamID, int gridID)
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
ngrids
=
vlistNgrids
(
vlistID
);
...
...
@@ -1100,8 +1094,8 @@ void cdfDefFC(int streamID, int gridID)
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
ngrids
=
vlistNgrids
(
vlistID
);
...
...
@@ -1167,8 +1161,8 @@ void cdfDefTrajLon(int streamID, int gridID)
if
(
gridInqPrec
(
gridID
)
==
DATATYPE_FLT32
)
xtype
=
NC_FLOAT
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
gridtype
=
gridInqType
(
gridID
);
dimlen
=
gridInqXsize
(
gridID
);
...
...
@@ -1227,8 +1221,8 @@ void cdfDefTrajLat(int streamID, int gridID)
if
(
gridInqPrec
(
gridID
)
==
DATATYPE_FLT32
)
xtype
=
NC_FLOAT
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
gridtype
=
gridInqType
(
gridID
);
dimlen
=
gridInqYsize
(
gridID
);
...
...
@@ -1356,8 +1350,8 @@ void cdfDefXaxis(int streamID, int gridID)
if
(
gridInqPrec
(
gridID
)
==
DATATYPE_FLT32
)
xtype
=
NC_FLOAT
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
ngrids
=
vlistNgrids
(
vlistID
);
...
...
@@ -1485,8 +1479,8 @@ void cdfDefYaxis(int streamID, int gridID)
if
(
gridInqPrec
(
gridID
)
==
DATATYPE_FLT32
)
xtype
=
NC_FLOAT
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
ngrids
=
vlistNgrids
(
vlistID
);
...
...
@@ -1635,8 +1629,8 @@ void cdfDefCurvilinear(int streamID, int gridID)
if
(
gridInqPrec
(
gridID
)
==
DATATYPE_FLT32
)
xtype
=
NC_FLOAT
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
ngrids
=
vlistNgrids
(
vlistID
);
...
...
@@ -1814,8 +1808,8 @@ void cdfDefRgrid(int streamID, int gridID)
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
ngrids
=
vlistNgrids
(
vlistID
);
...
...
@@ -1883,8 +1877,8 @@ void cdfDefGdim(int streamID, int gridID)
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
ngrids
=
vlistNgrids
(
vlistID
);
...
...
@@ -1980,8 +1974,8 @@ void cdfDefUnstructured(int streamID, int gridID)
if
(
gridInqPrec
(
gridID
)
==
DATATYPE_FLT32
)
xtype
=
NC_FLOAT
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
ngrids
=
vlistNgrids
(
vlistID
);
...
...
@@ -2158,7 +2152,7 @@ void cdfDefVCT(int streamID, int zaxisID)
return
;
}
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
if
(
streamptr
->
ncmode
==
2
)
cdf_redef
(
fileID
);
...
...
@@ -2244,8 +2238,8 @@ void cdfDefZaxis(int streamID, int zaxisID)
if
(
zaxisInqPrec
(
zaxisID
)
==
DATATYPE_FLT32
)
xtype
=
NC_FLOAT
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
zaxisindex
=
vlistZaxisIndex
(
vlistID
,
zaxisID
);
...
...
@@ -2481,7 +2475,7 @@ void cdfDefPole(int streamID, int gridID)
char
varname
[]
=
"rotated_pole"
;
char
mapname
[]
=
"rotated_latitude_longitude"
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
ypole
=
gridInqYpole
(
gridID
);
xpole
=
gridInqXpole
(
gridID
);
...
...
@@ -2516,7 +2510,7 @@ void cdfDefMapping(int streamID, int gridID)
char
varname
[]
=
"sinusoidal"
;
char
mapname
[]
=
"sinusoidal"
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
cdf_redef
(
fileID
);
...
...
@@ -2537,7 +2531,7 @@ void cdfDefMapping(int streamID, int gridID)
char
varname
[]
=
"laea"
;
char
mapname
[]
=
"lambert_azimuthal_equal_area"
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
cdf_redef
(
fileID
);
...
...
@@ -2561,7 +2555,7 @@ void cdfDefMapping(int streamID, int gridID)
char
varname
[]
=
"Lambert_Conformal"
;
char
mapname
[]
=
"lambert_conformal_conic"
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
cdf_redef
(
fileID
);
...
...
@@ -2604,7 +2598,7 @@ void cdfDefGrid(int streamID, int gridID)
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
gridindex
=
vlistGridIndex
(
vlistID
,
gridID
);
if
(
streamptr
->
xdimID
[
gridindex
]
!=
UNDEFID
)
return
;
...
...
@@ -2720,7 +2714,7 @@ int cdfDefVar(int streamID, int varID)
streamptr
=
stream_to_pointer
(
streamID
);
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
if
(
CDI_Debug
)
Message
(
"streamID = %d, fileID = %d, varID = %d"
,
streamID
,
fileID
,
varID
);
...
...
@@ -2728,7 +2722,7 @@ int cdfDefVar(int streamID, int varID)
if
(
streamptr
->
vars
[
varID
].
ncvarid
!=
UNDEFID
)
return
(
streamptr
->
vars
[
varID
].
ncvarid
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
gridID
=
vlistInqVarGrid
(
vlistID
,
varID
);
zaxisID
=
vlistInqVarZaxis
(
vlistID
,
varID
);
tsteptype
=
vlistInqVarTsteptype
(
vlistID
,
varID
);
...
...
@@ -3193,8 +3187,8 @@ void cdfReadVarDP(int streamID, int varID, double *data, int *nmiss)
if
(
CDI_Debug
)
Message
(
"streamID = %d varID = %d"
,
streamID
,
varID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
tsID
=
streamptr
->
curTsID
;
...
...
@@ -3505,14 +3499,14 @@ void cdf_write_var(int streamID, int varID, int memtype, const void *data, int n
if
(
CDI_Debug
)
Message
(
"streamID = %d varID = %d"
,
streamID
,
varID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
ntsteps
=
streamptr
->
ntsteps
;
if
(
CDI_Debug
)
Message
(
"ntsteps = %d"
,
ntsteps
);
if
(
vlistHasTime
(
vlistID
)
)
cdfDefTime
(
stream
ID
);
if
(
vlistHasTime
(
vlistID
)
)
cdfDefTime
(
stream
ptr
);
ncvarid
=
cdfDefVar
(
streamID
,
varID
);
...
...
@@ -3620,8 +3614,8 @@ int cdfReadVarSliceDP(int streamID, int varID, int levelID, double *data, int *n
if
(
CDI_Debug
)
Message
(
"streamID = %d varID = %d levelID = %d"
,
streamID
,
varID
,
levelID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
tsID
=
streamptr
->
curTsID
;
if
(
CDI_Debug
)
...
...
@@ -3823,13 +3817,13 @@ int cdf_write_var_slice(int streamID, int varID, int levelID, int memtype, const
if
(
CDI_Debug
)
Message
(
"streamID = %d varID = %d"
,
streamID
,
varID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
ntsteps
=
streamptr
->
ntsteps
;
if
(
CDI_Debug
)
Message
(
"ntsteps = %d"
,
ntsteps
);
if
(
vlistHasTime
(
vlistID
)
)
cdfDefTime
(
stream
ID
);
if
(
vlistHasTime
(
vlistID
)
)
cdfDefTime
(
stream
ptr
);
ncvarid
=
cdfDefVar
(
streamID
,
varID
);
...
...
@@ -3924,7 +3918,7 @@ void cdfCreateRecords(int streamID, int tsID)
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
if
(
tsID
<
0
||
(
tsID
>=
streamptr
->
ntsteps
&&
tsID
>
0
)
)
return
;
...
...
@@ -6416,8 +6410,8 @@ int cdfInqContents(int streamID)
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
;
if
(
CDI_Debug
)
Message
(
"streamID = %d, fileID = %d"
,
streamID
,
fileID
);
...
...
@@ -6963,7 +6957,7 @@ int cdfInqTimestep(int streamID, int tsID)
nctimevarid
=
streamptr
->
basetime
.
ncvarid
;
if
(
nctimevarid
!=
UNDEFID
)
{
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
index
=
tsID
;
if
(
streamptr
->
basetime
.
lwrf
)
...
...
@@ -7029,7 +7023,7 @@ void cdfEndDef(int streamID)
streamptr
=
stream_to_pointer
(
streamID
);
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
cdfDefGlobalAtts
(
streamID
);
cdfDefLocalAtts
(
streamID
);
...
...
@@ -7061,8 +7055,8 @@ void cdfDefInstitut(int streamID)
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
instID
=
vlistInqInstitut
(
vlistID
);
if
(
instID
!=
UNDEFID
)
...
...
@@ -7093,8 +7087,8 @@ void cdfDefSource(int streamID)
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
modelID
=
vlistInqModel
(
vlistID
);
if
(
modelID
!=
UNDEFID
)
...
...
@@ -7126,8 +7120,8 @@ void cdfDefGlobalAtts(int streamID)
if
(
streamptr
->
globalatts
)
return
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
cdfDefSource
(
streamID
);
cdfDefInstitut
(
streamID
);
...
...
@@ -7157,8 +7151,8 @@ void cdfDefLocalAtts(int streamID)
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
fileID
=
stream
ptr
->
file
ID
;
if
(
streamptr
->
localatts
)
return
;
if
(
vlistInqInstitut
(
vlistID
)
!=
UNDEFID
)
return
;
...
...
@@ -7243,7 +7237,7 @@ void cdfDefVars(int streamID)
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
if
(
vlistID
==
UNDEFID
)
Error
(
"Internal problem! vlist undefined for streamID %d"
,
streamID
);
...
...
@@ -7251,7 +7245,7 @@ void cdfDefVars(int streamID)
ngrids
=
vlistNgrids
(
vlistID
);
nzaxis
=
vlistNzaxis
(
vlistID
);
/*
if ( vlistHasTime(vlistID) ) cdfDefTime(stream
ID
);
if ( vlistHasTime(vlistID) ) cdfDefTime(stream
ptr
);
*/
for
(
index
=
0
;
index
<
ngrids
;
index
++
)
{
...
...
src/stream_cdf.h
View file @
941834bd
...
...
@@ -2,7 +2,7 @@
#define _STREAM_CDF_H
void
cdfDefVars
(
int
streamID
);
void
cdfDefTimestep
(
in
t
stream
ID
,
int
tsID
);
void
cdfDefTimestep
(
stream_
t
*
stream
ptr
,
int
tsID
);
int
cdfInqTimestep
(
int
streamID
,
int
tsID
);
int
cdfInqContents
(
int
streamID
);
void
cdfDefHistory
(
int
streamID
,
int
size
,
char
*
history
);
...
...
src/stream_cgribex.c
View file @
941834bd
...
...
@@ -369,7 +369,7 @@ void cgribexAddRecord(int streamID, int param, int *isec1, int *isec2, double *f
streamptr
=
stream_to_pointer
(
streamID
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
tsID
=
streamptr
->
curTsID
;
recID
=
recordNewEntry
(
streamptr
,
tsID
);
record
=
&
streamptr
->
tsteps
[
tsID
].
records
[
recID
];
...
...
@@ -566,7 +566,7 @@ int cgribexScanTimestep1(int streamID)
if
(
tsID
!=
0
)
Error
(
"Internal problem! tstepsNewEntry returns %d"
,
tsID
);
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
while
(
nskip
--
>
0
)
{
...
...
@@ -730,7 +730,7 @@ int cgribexScanTimestep1(int streamID)
taxis
->
vdate
=
datetime0
.
date
;
taxis
->
vtime
=
datetime0
.
time
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
vlistDefTaxis
(
vlistID
,
taxisID
);
nrecords
=
streamptr
->
tsteps
[
0
].
nallrecs
;
...
...
@@ -818,8 +818,8 @@ int cgribexScanTimestep2(int streamID)
isec3
=
streamptr
->
record
->
sec3
;
isec4
=
streamptr
->
record
->
sec4
;
fileID
=
stream
InqFileID
(
stream
ID
)
;
vlistID
=
stream
InqVlist
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
vlistID
=
stream
ptr
->
vlist
ID
;
taxisID
=
vlistInqTaxis
(
vlistID
);
gribbuffer
=
(
unsigned
char
*
)
streamptr
->
record
->
buffer
;
...
...
@@ -1086,7 +1086,7 @@ int cgribexScanTimestep(int streamID)
stream_check_ptr
(
__func__
,
streamptr
);
vlistID
=
stream
InqVlist
(
stream
ID
)
;
vlistID
=
stream
ptr
->
vlist
ID
;
if
(
CDI_Debug
)
{
...
...
@@ -1119,7 +1119,7 @@ int cgribexScanTimestep(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
);
...
...
src/stream_ext.c
View file @
941834bd
...
...
@@ -85,8 +85,8 @@ int extInqRecord(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;
extp = streamptr->record->extp;
*varID = -1;
...
...
@@ -129,8 +129,8 @@ int extReadRecord(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
];
...
...
@@ -193,8 +193,8 @@ int extCopyRecord(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
;
...
...
@@ -257,7 +257,7 @@ int extWriteRecord(int streamID, const double *data)
stream_check_ptr
(
__func__
,
streamptr
);
fileID
=
stream
InqFileID
(
stream
ID
)
;
fileID
=
stream
ptr
->
file
ID
;
extp
=
streamptr
->
record
->
extp
;
extDefDataDP
(
extp
,
data
);
...
...
@@ -282,7 +282,7 @@ void extAddRecord(int streamID, int param, int level, int xysize,
streamptr
=
stream_to_pointer
(
streamID
);