Skip to content
GitLab
Menu
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
1f821c10
Commit
1f821c10
authored
Jan 20, 2017
by
Thomas Jahns
🤸
Browse files
Fix warning for conversion of function result.
parent
1cee42ba
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/stream_cgribex.c
View file @
1f821c10
...
...
@@ -1871,7 +1871,7 @@ void cgribexDefLevel(int *isec1, int *isec2, double *fsec2, int zaxisID, int lev
case
ZAXIS_DEPTH_BELOW_SEA
:
case
ZAXIS_ISENTROPIC
:
{
isec1DefLevel
(
isec1
,
grib_ltype
,
(
int
)
zaxisInqLevel
(
zaxisID
,
levelID
),
0
);
isec1DefLevel
(
isec1
,
grib_ltype
,
(
int
)
(
zaxisInqLevel
(
zaxisID
,
levelID
)
)
,
0
);
break
;
}
case
ZAXIS_CLOUD_BASE
:
...
...
@@ -1888,10 +1888,10 @@ void cgribexDefLevel(int *isec1, int *isec2, double *fsec2, int zaxisID, int lev
case
ZAXIS_HYBRID_HALF
:
{
if
(
zaxisInqLbounds
(
zaxisID
,
NULL
)
&&
zaxisInqUbounds
(
zaxisID
,
NULL
)
)
isec1DefLevel
(
isec1
,
GRIB1_LTYPE_HYBRID_LAYER
,
(
int
)
zaxisInqLbound
(
zaxisID
,
levelID
),
(
int
)
zaxisInqUbound
(
zaxisID
,
levelID
));
isec1DefLevel
(
isec1
,
GRIB1_LTYPE_HYBRID_LAYER
,
(
int
)
(
zaxisInqLbound
(
zaxisID
,
levelID
)
)
,
(
int
)
(
zaxisInqUbound
(
zaxisID
,
levelID
))
)
;
else
isec1DefLevel
(
isec1
,
GRIB1_LTYPE_HYBRID
,
(
int
)
zaxisInqLevel
(
zaxisID
,
levelID
),
0
);
isec1DefLevel
(
isec1
,
GRIB1_LTYPE_HYBRID
,
(
int
)
(
zaxisInqLevel
(
zaxisID
,
levelID
)
)
,
0
);
int
vctsize
=
zaxisInqVctSize
(
zaxisID
);
if
(
vctsize
>
255
)
...
...
@@ -1945,10 +1945,10 @@ void cgribexDefLevel(int *isec1, int *isec2, double *fsec2, int zaxisID, int lev
case
ZAXIS_SIGMA
:
{
if
(
zaxisInqLbounds
(
zaxisID
,
NULL
)
&&
zaxisInqUbounds
(
zaxisID
,
NULL
)
)
isec1DefLevel
(
isec1
,
GRIB1_LTYPE_SIGMA_LAYER
,
(
int
)
zaxisInqLbound
(
zaxisID
,
levelID
),
(
int
)
zaxisInqUbound
(
zaxisID
,
levelID
));
isec1DefLevel
(
isec1
,
GRIB1_LTYPE_SIGMA_LAYER
,
(
int
)
(
zaxisInqLbound
(
zaxisID
,
levelID
)
)
,
(
int
)
(
zaxisInqUbound
(
zaxisID
,
levelID
))
)
;
else
isec1DefLevel
(
isec1
,
GRIB1_LTYPE_SIGMA
,
(
int
)
zaxisInqLevel
(
zaxisID
,
levelID
),
0
);
isec1DefLevel
(
isec1
,
GRIB1_LTYPE_SIGMA
,
(
int
)
(
zaxisInqLevel
(
zaxisID
,
levelID
)
)
,
0
);
break
;
}
...
...
@@ -1971,7 +1971,7 @@ void cgribexDefLevel(int *isec1, int *isec2, double *fsec2, int zaxisID, int lev
}
case
ZAXIS_GENERIC
:
{
isec1DefLevel
(
isec1
,
ltype
,
(
int
)
zaxisInqLevel
(
zaxisID
,
levelID
),
0
);
isec1DefLevel
(
isec1
,
ltype
,
(
int
)
(
zaxisInqLevel
(
zaxisID
,
levelID
)
)
,
0
);
break
;
}
default:
...
...
src/stream_ext.c
View file @
1f821c10
...
...
@@ -715,7 +715,7 @@ void extWriteVarSliceDP(stream_t *streamptr, int varID, int levID, const double
int
header
[
4
];
header
[
0
]
=
streamptr
->
tsteps
[
tsID
].
taxis
.
vdate
;
header
[
1
]
=
pnum
;
header
[
2
]
=
(
int
)
zaxisInqLevel
(
vlistInqVarZaxis
(
vlistID
,
varID
),
levID
);
header
[
2
]
=
(
int
)
(
zaxisInqLevel
(
vlistInqVarZaxis
(
vlistID
,
varID
),
levID
)
)
;
header
[
3
]
=
gridInqSize
(
vlistInqVarGrid
(
vlistID
,
varID
));
extrec_t
*
extp
=
(
extrec_t
*
)
streamptr
->
record
->
exsep
;
...
...
src/stream_ieg.c
View file @
1f821c10
...
...
@@ -395,16 +395,16 @@ void iegDefLevel(int *pdb, int *gdb, double *vct, int zaxisID, int levelID)
{
case
ZAXIS_SURFACE
:
{
pdbDefLevel
(
pdb
,
IEG_LTYPE_SURFACE
,
0
,
(
int
)
zaxisInqLevel
(
zaxisID
,
levelID
));
pdbDefLevel
(
pdb
,
IEG_LTYPE_SURFACE
,
0
,
(
int
)
(
zaxisInqLevel
(
zaxisID
,
levelID
))
)
;
break
;
}
case
ZAXIS_HYBRID
:
{
if
(
zaxisInqLbounds
(
zaxisID
,
NULL
)
&&
zaxisInqUbounds
(
zaxisID
,
NULL
)
)
pdbDefLevel
(
pdb
,
IEG_LTYPE_HYBRID_LAYER
,
(
int
)
zaxisInqLbound
(
zaxisID
,
levelID
),
(
int
)
zaxisInqUbound
(
zaxisID
,
levelID
));
pdbDefLevel
(
pdb
,
IEG_LTYPE_HYBRID_LAYER
,
(
int
)
(
zaxisInqLbound
(
zaxisID
,
levelID
)
)
,
(
int
)
(
zaxisInqUbound
(
zaxisID
,
levelID
))
)
;
else
pdbDefLevel
(
pdb
,
IEG_LTYPE_HYBRID
,
0
,
(
int
)
zaxisInqLevel
(
zaxisID
,
levelID
));
pdbDefLevel
(
pdb
,
IEG_LTYPE_HYBRID
,
0
,
(
int
)
(
zaxisInqLevel
(
zaxisID
,
levelID
))
)
;
int
vctsize
=
zaxisInqVctSize
(
zaxisID
);
if
(
vctsize
>
100
)
...
...
@@ -460,9 +460,9 @@ void iegDefLevel(int *pdb, int *gdb, double *vct, int zaxisID, int levelID)
case
ZAXIS_DEPTH_BELOW_LAND
:
{
if
(
zaxisInqLbounds
(
zaxisID
,
NULL
)
&&
zaxisInqUbounds
(
zaxisID
,
NULL
)
)
pdbDefLevel
(
pdb
,
IEG_LTYPE_LANDDEPTH_LAYER
,
(
int
)
zaxisInqLbound
(
zaxisID
,
levelID
),
(
int
)
zaxisInqUbound
(
zaxisID
,
levelID
));
pdbDefLevel
(
pdb
,
IEG_LTYPE_LANDDEPTH_LAYER
,
(
int
)
(
zaxisInqLbound
(
zaxisID
,
levelID
)
)
,
(
int
)
(
zaxisInqUbound
(
zaxisID
,
levelID
))
)
;
else
pdbDefLevel
(
pdb
,
IEG_LTYPE_LANDDEPTH
,
0
,
(
int
)
zaxisInqLevel
(
zaxisID
,
levelID
));
pdbDefLevel
(
pdb
,
IEG_LTYPE_LANDDEPTH
,
0
,
(
int
)
(
zaxisInqLevel
(
zaxisID
,
levelID
))
)
;
break
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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