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
18f7cf0c
Commit
18f7cf0c
authored
Jan 23, 2012
by
Uwe Schulzweida
Browse files
stream_cgribex: changed prec to datatype
parent
6c74a561
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/stream_cgribex.c
View file @
18f7cf0c
...
@@ -351,7 +351,7 @@ void cgribexGetGrid(stream_t *streamptr, int *isec2, int *isec4, grid_t *grid)
...
@@ -351,7 +351,7 @@ void cgribexGetGrid(stream_t *streamptr, int *isec2, int *isec4, grid_t *grid)
#if defined (HAVE_LIBCGRIBEX)
#if defined (HAVE_LIBCGRIBEX)
static
static
void
cgribexAddRecord
(
int
streamID
,
int
param
,
int
*
isec1
,
int
*
isec2
,
double
*
fsec2
,
double
*
fsec3
,
void
cgribexAddRecord
(
int
streamID
,
int
param
,
int
*
isec1
,
int
*
isec2
,
double
*
fsec2
,
double
*
fsec3
,
int
*
isec4
,
long
recsize
,
off_t
position
,
int
prec
,
int
comptype
,
int
lmv
)
int
*
isec4
,
long
recsize
,
off_t
position
,
int
datatype
,
int
comptype
,
int
lmv
)
{
{
int
zaxistype
;
int
zaxistype
;
int
gridID
=
CDI_UNDEFID
,
varID
;
int
gridID
=
CDI_UNDEFID
,
varID
;
...
@@ -404,11 +404,11 @@ void cgribexAddRecord(int streamID, int param, int *isec1, int *isec2, double *f
...
@@ -404,11 +404,11 @@ void cgribexAddRecord(int streamID, int param, int *isec1, int *isec2, double *f
lbounds
=
cgribexGetZaxisHasBounds
(
ISEC1_LevelType
);
lbounds
=
cgribexGetZaxisHasBounds
(
ISEC1_LevelType
);
if
(
prec
>
32
)
prec
=
DATATYPE_PACK32
;
if
(
datatype
>
32
)
datatype
=
DATATYPE_PACK32
;
if
(
prec
<
0
)
prec
=
DATATYPE_PACK
;
if
(
datatype
<
0
)
datatype
=
DATATYPE_PACK
;
varAddRecord
(
recID
,
param
,
gridID
,
zaxistype
,
lbounds
,
level1
,
level2
,
varAddRecord
(
recID
,
param
,
gridID
,
zaxistype
,
lbounds
,
level1
,
level2
,
prec
,
&
varID
,
&
levelID
,
tsteptype
,
numavg
,
ISEC1_LevelType
,
NULL
,
NULL
,
NULL
);
datatype
,
&
varID
,
&
levelID
,
tsteptype
,
numavg
,
ISEC1_LevelType
,
NULL
,
NULL
,
NULL
);
(
*
record
).
varID
=
varID
;
(
*
record
).
varID
=
varID
;
(
*
record
).
levelID
=
levelID
;
(
*
record
).
levelID
=
levelID
;
...
@@ -526,7 +526,7 @@ int cgribexScanTimestep1(int streamID)
...
@@ -526,7 +526,7 @@ int cgribexScanTimestep1(int streamID)
int
varID
;
int
varID
;
size_t
readsize
;
size_t
readsize
;
int
nrecords
,
nrecs
,
recID
;
int
nrecords
,
nrecs
,
recID
;
int
prec
;
int
datatype
;
long
recsize
=
0
;
long
recsize
=
0
;
int
warn_time
=
TRUE
;
int
warn_time
=
TRUE
;
int
warn_numavg
=
TRUE
;
int
warn_numavg
=
TRUE
;
...
@@ -619,9 +619,9 @@ int cgribexScanTimestep1(int streamID)
...
@@ -619,9 +619,9 @@ int cgribexScanTimestep1(int streamID)
gribDateTime
(
isec1
,
&
vdate
,
&
vtime
);
gribDateTime
(
isec1
,
&
vdate
,
&
vtime
);
if
(
ISEC4_NumBits
>
0
&&
ISEC4_NumBits
<=
32
)
if
(
ISEC4_NumBits
>
0
&&
ISEC4_NumBits
<=
32
)
prec
=
ISEC4_NumBits
;
datatype
=
ISEC4_NumBits
;
else
else
prec
=
DATATYPE_PACK
;
datatype
=
DATATYPE_PACK
;
if
(
nrecs
==
0
)
if
(
nrecs
==
0
)
{
{
...
@@ -696,7 +696,7 @@ int cgribexScanTimestep1(int streamID)
...
@@ -696,7 +696,7 @@ int cgribexScanTimestep1(int streamID)
Message
(
"%4d %8d %4d %8d %8d %6d"
,
nrecs
,
(
int
)
recpos
,
param
,
level1
,
vdate
,
vtime
);
Message
(
"%4d %8d %4d %8d %8d %6d"
,
nrecs
,
(
int
)
recpos
,
param
,
level1
,
vdate
,
vtime
);
cgribexAddRecord
(
streamID
,
param
,
isec1
,
isec2
,
fsec2
,
fsec3
,
cgribexAddRecord
(
streamID
,
param
,
isec1
,
isec2
,
fsec2
,
fsec3
,
isec4
,
recsize
,
recpos
,
prec
,
comptype
,
lmv
);
isec4
,
recsize
,
recpos
,
datatype
,
comptype
,
lmv
);
}
}
streamptr
->
rtsteps
=
1
;
streamptr
->
rtsteps
=
1
;
...
...
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