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
39366b0c
Commit
39366b0c
authored
Jun 06, 2017
by
Uwe Schulzweida
Browse files
Changed boolean ints to stdbool.
parent
a8e62ebc
Changes
25
Expand all
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
39366b0c
2017-09-16 Uwe Schulzweida
* using CGRIBEX library version 1.8.1
* Version 1.9.0 released
2017-06-06 Uwe Schulzweida
* Changed boolean ints to stdbool
2017-05-16 Uwe Schulzweida
* Version 1.8.2 released
...
...
config/default
View file @
39366b0c
...
...
@@ -24,7 +24,7 @@ case "${HOSTNAME}" in
--enable-iso-c-interface
\
--enable-swig
\
--enable-python
\
--with-grib_api
=
$HOME
/local/gribapi-1.1
2.3
\
--with-grib_api
=
$HOME
/local/grib
_
api-1.1
4.7
\
--with-netcdf
=
$HOME
/local
\
--with-szlib
=
$HOME
/local
\
CC
=
icc
CFLAGS
=
"-g -D_REENTRANT -Wall -Wwrite-strings -O3 -march=native -fp-model source"
...
...
@@ -35,7 +35,7 @@ case "${HOSTNAME}" in
--enable-iso-c-interface
\
--enable-swig
\
--enable-python
\
--with-grib_api
=
$HOME
/local/grib_api-1.1
3.1
\
--with-grib_api
=
$HOME
/local/grib_api-1.1
4.7
\
--with-netcdf
=
$HOME
/local/netcdf-c-4.3.3.1-threadsafe
\
--with-szlib
=
$HOME
/local
\
CC
=
gcc
CFLAGS
=
"-g -pipe -D_REENTRANT -Wall -Wwrite-strings -W -Wfloat-equal -pedantic -O3 -march=native"
...
...
src/Makefile.in
View file @
39366b0c
...
...
@@ -945,8 +945,8 @@ distclean-generic:
maintainer-clean-generic
:
@
echo
"This command is intended for maintainers to use"
@
echo
"it deletes files that may require special tools to rebuild."
@ENABLE_CDI_LIB_FALSE@install-exec-local
:
@ENABLE_CDI_LIB_FALSE@uninstall-local
:
@ENABLE_CDI_LIB_FALSE@install-exec-local
:
clean
:
clean-am
clean-am
:
clean-generic clean-libLTLIBRARIES clean-libtool
\
...
...
src/cdf.c
View file @
39366b0c
...
...
@@ -163,15 +163,15 @@ int cdfOpen(const char *filename, const char *mode)
int
cdfOpen64
(
const
char
*
filename
,
const
char
*
mode
)
{
int
fileID
=
-
1
;
int
open_file
=
TRUE
;
int
filetype
=
CDI_FILETYPE_NC2
;
bool
open_file
=
true
;
if
(
CDF_Debug
)
Message
(
"Open %s with mode %c"
,
filename
,
*
mode
);
#if defined (HAVE_LIBNETCDF)
#if ! defined (NC_64BIT_OFFSET)
open_file
=
FALSE
;
open_file
=
false
;
#endif
#endif
...
...
@@ -194,13 +194,13 @@ int cdfOpen64(const char *filename, const char *mode)
int
cdf4Open
(
const
char
*
filename
,
const
char
*
mode
,
int
*
filetype
)
{
int
fileID
=
-
1
;
int
open_file
=
FALSE
;
bool
open_file
=
false
;
if
(
CDF_Debug
)
Message
(
"Open %s with mode %c"
,
filename
,
*
mode
);
#if defined (HAVE_NETCDF4)
open_file
=
TRUE
;
open_file
=
true
;
#endif
if
(
open_file
)
...
...
src/cdf_int.c
View file @
39366b0c
...
...
@@ -76,12 +76,12 @@ void cdf_create(const char *path, int cmode, int *ncidp)
int
cdf_open
(
const
char
*
path
,
int
omode
,
int
*
ncidp
)
{
int
status
=
0
;
int
dapfile
=
FALSE
;
bool
dapfile
=
false
;
struct
stat
filestat
;
size_t
chunksizehint
=
0
;
#if defined (HAVE_LIBNC_DAP)
if
(
strncmp
(
path
,
"http:"
,
5
)
==
0
||
strncmp
(
path
,
"https:"
,
6
)
==
0
)
dapfile
=
TRUE
;
if
(
strncmp
(
path
,
"http:"
,
5
)
==
0
||
strncmp
(
path
,
"https:"
,
6
)
==
0
)
dapfile
=
true
;
#endif
if
(
dapfile
)
...
...
src/cdi_int.c
View file @
39366b0c
...
...
@@ -32,9 +32,9 @@ int cdiNcChunksizehint = CDI_UNDEFID;
int
cdiChunkType
=
CDI_CHUNK_GRID
;
int
cdiSplitLtype105
=
CDI_UNDEFID
;
int
cdiIgnoreAttCoordinates
=
FALSE
;
int
cdiCoordinatesLonLat
=
FALSE
;
int
cdiIgnoreValidRange
=
FALSE
;
bool
cdiIgnoreAttCoordinates
=
false
;
bool
cdiCoordinatesLonLat
=
false
;
bool
cdiIgnoreValidRange
=
false
;
int
cdiSkipRecords
=
0
;
int
cdiConvention
=
CDI_CONVENTION_ECHAM
;
int
cdiInventoryMode
=
1
;
...
...
@@ -314,13 +314,13 @@ void cdiSetChunk(const char *chunkAlgo)
void
cdiInitialize
(
void
)
{
static
int
Init_CDI
=
FALSE
;
char
*
envstr
;
long
value
;
static
bool
Init_CDI
=
false
;
if
(
!
Init_CDI
)
{
Init_CDI
=
TRUE
;
Init_CDI
=
true
;
char
*
envstr
;
long
value
;
#if defined (HAVE_LIBCGRIBEX)
gribFixZSE
(
1
);
// 1: Fix ZeroShiftError of simple packed spherical harmonics
...
...
@@ -370,13 +370,13 @@ void cdiInitialize(void)
if
(
envstr
)
cdiSplitLtype105
=
atoi
(
envstr
);
envstr
=
getenv
(
"IGNORE_ATT_COORDINATES"
);
if
(
envstr
)
cdiIgnoreAttCoordinates
=
atoi
(
envstr
);
if
(
envstr
)
cdiIgnoreAttCoordinates
=
atoi
(
envstr
)
>
0
;
envstr
=
getenv
(
"CDI_COORDINATES_LONLAT"
);
if
(
envstr
)
cdiCoordinatesLonLat
=
atoi
(
envstr
);
if
(
envstr
)
cdiCoordinatesLonLat
=
atoi
(
envstr
)
>
0
;
envstr
=
getenv
(
"IGNORE_VALID_RANGE"
);
if
(
envstr
)
cdiIgnoreValidRange
=
atoi
(
envstr
);
if
(
envstr
)
cdiIgnoreValidRange
=
atoi
(
envstr
)
>
0
;
envstr
=
getenv
(
"CDI_SKIP_RECORDS"
);
if
(
envstr
)
...
...
src/cdi_int.h
View file @
39366b0c
...
...
@@ -160,9 +160,9 @@ typedef struct
// (181; 105, 0, timeRangeIndicator=0) .. instantanous rain
// (181; 105, 0, timeRangeIndicator=4) .. accumulated rain .. both can be in the same grib file
#endif // HIRLAM_EXTENSIONS
short
used
;
short
varID
;
short
levelID
;
short
used
;
char
varname
[
32
];
/* needed for grib decoding with GRIB_API */
var_tile_t
tiles
;
/* tile-related meta-data, currently for GRIB-API only. */
}
...
...
@@ -178,7 +178,7 @@ typedef struct {
/* tsID>0 number of non constant records */
int
nallrecs
;
/* number of all records */
int
curRecID
;
/* current record ID */
long
next
;
bool
next
;
off_t
position
;
/* timestep file position */
taxis_t
taxis
;
}
...
...
@@ -297,7 +297,7 @@ typedef enum {
typedef
struct
{
char
*
keyword
;
/* keyword string */
int
update
;
bool
update
;
key_val_pair_datatype
data_type
;
/* data type of this key/value pair */
double
dbl_val
;
/* double value (data_type == t_double) */
int
int_val
;
/* integer value (data_type == t_int) */
...
...
@@ -333,9 +333,9 @@ extern int cdiDataUnreduced;
extern
int
cdiSortName
;
extern
int
cdiSortParam
;
extern
int
cdiHaveMissval
;
extern
int
cdiIgnoreAttCoordinates
;
extern
int
cdiCoordinatesLonLat
;
extern
int
cdiIgnoreValidRange
;
extern
bool
cdiIgnoreAttCoordinates
;
extern
bool
cdiCoordinatesLonLat
;
extern
bool
cdiIgnoreValidRange
;
extern
int
cdiSkipRecords
;
extern
int
cdiConvention
;
extern
int
cdiInventoryMode
;
...
...
src/cgribex.h
View file @
39366b0c
#ifndef
_
CGRIBEX_H
#define
_
CGRIBEX_H
#ifndef CGRIBEX_H
#define CGRIBEX_H
#include
<stdio.h>
#include
<stdbool.h>
#include
<sys/types.h>
#define GRIB_MISSVAL -9.E33
...
...
@@ -206,7 +207,7 @@ void gribSetCalendar(int calendar);
void
gribDateTime
(
int
*
isec1
,
int
*
date
,
int
*
time
);
int
gribRefDate
(
int
*
isec1
);
int
gribRefTime
(
int
*
isec1
);
int
gribTimeIsFC
(
int
*
isec1
);
bool
gribTimeIsFC
(
int
*
isec1
);
void
gribPrintSec0
(
int
*
isec0
);
void
gribPrintSec1
(
int
*
isec0
,
int
*
isec1
);
...
...
@@ -254,5 +255,5 @@ double calculate_pfactor_double(const double* spectralField, long fieldTruncatio
}
#endif
#endif
/*
_
CGRIBEX_H */
#endif
/* CGRIBEX_H */
src/cgribexlib.c
View file @
39366b0c
This diff is collapsed.
Click to expand it.
src/gribapi.c
View file @
39366b0c
...
...
@@ -15,7 +15,7 @@
static
char
gribapi_libvers
[
64
]
=
""
;
#if defined (HAVE_LIBGRIB_API)
static
int
gribapi_libvers_init
;
static
bool
gribapi_libvers_init
;
#endif
...
...
@@ -43,7 +43,7 @@ const char *gribapiLibraryVersionString(void)
gribapiLibraryVersion
(
&
major_version
,
&
minor_version
,
&
revision_version
);
sprintf
(
gribapi_libvers
,
"%d.%d.%d"
,
major_version
,
minor_version
,
revision_version
);
gribapi_libvers_init
=
1
;
gribapi_libvers_init
=
true
;
}
#endif
...
...
@@ -76,7 +76,7 @@ void gribContainersNew(stream_t * streamptr)
for
(
int
levelID
=
0
;
levelID
<
nlevs
;
++
levelID
)
{
gribContainers
[
varID
][
levelID
].
gribHandle
=
gribHandleNew
(
editionNumber
);
gribContainers
[
varID
][
levelID
].
init
=
FALSE
;
gribContainers
[
varID
][
levelID
].
init
=
false
;
}
}
...
...
@@ -88,7 +88,7 @@ void gribContainersNew(stream_t * streamptr)
for
(
int
varID
=
0
;
varID
<
nvars
;
++
varID
)
{
gribContainers
[
varID
].
gribHandle
=
gribHandleNew
(
editionNumber
);
gribContainers
[
varID
].
init
=
FALSE
;
gribContainers
[
varID
].
init
=
false
;
}
streamptr
->
gribContainers
=
(
void
*
)
gribContainers
;
...
...
src/gribapi.h
View file @
39366b0c
...
...
@@ -110,7 +110,7 @@ static inline void gribHandleDelete(void *gh)
#endif
typedef
struct
{
int
init
;
bool
init
;
void
*
gribHandle
;
}
gribContainer_t
;
...
...
src/gribapi_utilities.c
View file @
39366b0c
...
...
@@ -427,7 +427,7 @@ int gribapiGetTsteptype(grib_handle *gh)
{
if
(
CDI_Debug
)
Warning
(
"timeRangeIND = %d; stepType= %s; tsteptype=%d unsupported timeRangeIND at the moment, set to instant!"
,
timeRangeIND
,
stepType
,
tsteptype
);
lprint
=
FALSE
;
lprint
=
false
;
}
break
;
}
...
...
src/stream_cdf_i.c
View file @
39366b0c
...
...
@@ -1329,7 +1329,7 @@ void cdf_scan_var_attr(int nvars, ncvar_t *ncvars, ncdim_t *ncdims, int timedimi
if
(
status
==
NC_NOERR
)
{
cdf_set_var
(
ncvars
,
dimvarid
,
FALSE
);
if
(
cdiIgnoreAttCoordinates
==
false
)
if
(
!
cdiIgnoreAttCoordinates
)
{
ncvars
[
ncvarid
].
coordvarids
[
i
]
=
dimvarid
;
ncvars
[
ncvarid
].
ncoordvars
++
;
...
...
@@ -1372,7 +1372,7 @@ void cdf_scan_var_attr(int nvars, ncvar_t *ncvars, ncdim_t *ncdims, int timedimi
if
(
status
==
NC_NOERR
)
{
cdf_set_var
(
ncvars
,
dimvarid
,
FALSE
);
// if ( cdiIgnoreAttCoordinates
== FALSE
)
// if (
!
cdiIgnoreAttCoordinates )
{
ncvars
[
ncvarid
].
auxvarids
[
i
]
=
dimvarid
;
ncvars
[
ncvarid
].
nauxvars
++
;
...
...
@@ -1430,9 +1430,8 @@ void cdf_scan_var_attr(int nvars, ncvar_t *ncvars, ncdim_t *ncdims, int timedimi
{
if
(
ncvars
[
ncvarid
].
lvalidrange
==
false
)
{
extern
int
cdiIgnoreValidRange
;
bool
lignore
=
xtypeIsFloat
(
atttype
)
!=
xtypeIsFloat
(
xtype
);
if
(
cdiIgnoreValidRange
==
FALSE
&&
lignore
==
false
)
if
(
!
cdiIgnoreValidRange
&&
lignore
==
false
)
{
cdfGetAttDouble
(
ncid
,
ncvarid
,
attname
,
2
,
ncvars
[
ncvarid
].
validrange
);
ncvars
[
ncvarid
].
lvalidrange
=
true
;
...
...
@@ -1450,9 +1449,8 @@ void cdf_scan_var_attr(int nvars, ncvar_t *ncvars, ncdim_t *ncdims, int timedimi
{
if
(
ncvars
[
ncvarid
].
lvalidrange
==
false
)
{
extern
int
cdiIgnoreValidRange
;
bool
lignore
=
xtypeIsFloat
(
atttype
)
!=
xtypeIsFloat
(
xtype
);
if
(
cdiIgnoreValidRange
==
FALSE
&&
lignore
==
false
)
if
(
!
cdiIgnoreValidRange
&&
lignore
==
false
)
{
cdfGetAttDouble
(
ncid
,
ncvarid
,
attname
,
1
,
&
(
ncvars
[
ncvarid
].
validrange
)[
0
]);
ncvars
[
ncvarid
].
lvalidrange
=
true
;
...
...
@@ -1467,9 +1465,8 @@ void cdf_scan_var_attr(int nvars, ncvar_t *ncvars, ncdim_t *ncdims, int timedimi
{
if
(
ncvars
[
ncvarid
].
lvalidrange
==
false
)
{
extern
int
cdiIgnoreValidRange
;
bool
lignore
=
xtypeIsFloat
(
atttype
)
!=
xtypeIsFloat
(
xtype
);
if
(
cdiIgnoreValidRange
==
FALSE
&&
lignore
==
false
)
if
(
!
cdiIgnoreValidRange
&&
lignore
==
false
)
{
cdfGetAttDouble
(
ncid
,
ncvarid
,
attname
,
1
,
&
(
ncvars
[
ncvarid
].
validrange
)[
1
]);
ncvars
[
ncvarid
].
lvalidrange
=
true
;
...
...
src/stream_cdf_o.c
View file @
39366b0c
...
...
@@ -1906,8 +1906,7 @@ void cdfDefGrid(stream_t *streamptr, int gridID, int gridindex)
}
else
{
int
ndims
=
!
(
gridtype
==
GRID_LONLAT
&&
size
==
1
&&
gridInqHasDims
(
gridID
)
==
FALSE
);
int
ndims
=
!
(
gridtype
==
GRID_LONLAT
&&
size
==
1
&&
!
gridInqHasDims
(
gridID
));
if
(
gridInqXsize
(
gridID
)
>
0
)
cdfDefXaxis
(
streamptr
,
gridID
,
gridindex
,
ndims
);
if
(
gridInqYsize
(
gridID
)
>
0
)
cdfDefYaxis
(
streamptr
,
gridID
,
gridindex
,
ndims
);
...
...
src/stream_cgribex.c
View file @
39366b0c
...
...
@@ -577,7 +577,7 @@ cgribexScanTsFixNtsteps(stream_t *streamptr, off_t recpos)
if
(
tsID
!=
streamptr
->
rtsteps
)
Error
(
"Internal error. tsID = %d"
,
tsID
);
streamptr
->
tsteps
[
tsID
-
1
].
next
=
TRUE
;
streamptr
->
tsteps
[
tsID
-
1
].
next
=
true
;
streamptr
->
tsteps
[
tsID
].
position
=
recpos
;
}
}
...
...
@@ -652,7 +652,7 @@ int cgribexScanTimestep1(stream_t *streamptr)
}
unsigned
nrecs
=
0
;
while
(
TRUE
)
while
(
true
)
{
recsize
=
gribGetSize
(
fileID
);
recpos
=
fileGetPos
(
fileID
);
...
...
@@ -871,7 +871,7 @@ int cgribexScanTimestep2(stream_t * streamptr)
int
nrecs_scanned
=
nrecords
;
int
rindex
=
0
;
while
(
TRUE
)
while
(
true
)
{
if
(
rindex
>
nrecords
)
break
;
...
...
@@ -976,7 +976,7 @@ int cgribexScanTimestep2(stream_t * streamptr)
}
else
{
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
TRUE
;
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
true
;
streamptr
->
tsteps
[
tsID
].
recIDs
[
rindex
]
=
recID
;
}
}
...
...
@@ -991,7 +991,7 @@ int cgribexScanTimestep2(stream_t * streamptr)
}
else
{
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
TRUE
;
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
true
;
streamptr
->
tsteps
[
tsID
].
recIDs
[
rindex
]
=
recID
;
}
}
...
...
@@ -1114,7 +1114,7 @@ int cgribexScanTimestep(stream_t * streamptr)
nrecs_scanned
=
streamptr
->
tsteps
[
0
].
nallrecs
+
streamptr
->
tsteps
[
1
].
nrecs
*
(
tsID
-
1
);
rindex
=
0
;
while
(
TRUE
)
while
(
true
)
{
if
(
rindex
>
nrecs
)
break
;
...
...
@@ -1227,7 +1227,7 @@ int cgribexScanTimestep(stream_t * streamptr)
if
(
cdiInventoryMode
==
1
)
{
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
TRUE
;
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
true
;
streamptr
->
tsteps
[
tsID
].
recIDs
[
rindex
]
=
recID
;
}
else
...
...
@@ -1246,7 +1246,7 @@ int cgribexScanTimestep(stream_t * streamptr)
}
else
{
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
TRUE
;
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
true
;
streamptr
->
tsteps
[
tsID
].
recIDs
[
rindex
]
=
recID
;
}
}
...
...
@@ -1291,7 +1291,7 @@ int cgribexScanTimestep(stream_t * streamptr)
if
(
tsID
!=
streamptr
->
rtsteps
)
Error
(
"Internal error. tsID = %d"
,
tsID
);
streamptr
->
tsteps
[
tsID
-
1
].
next
=
1
;
streamptr
->
tsteps
[
tsID
-
1
].
next
=
true
;
streamptr
->
tsteps
[
tsID
].
position
=
recpos
;
}
...
...
@@ -1672,7 +1672,7 @@ void cgribexDefGrid(int *isec1, int *isec2, double *fsec2, int *isec4, int gridI
}
}
ISEC2_Reduced
=
FALSE
;
ISEC2_Reduced
=
false
;
ISEC2_ScanFlag
=
0
;
switch
(
gridtype
)
...
...
@@ -1697,7 +1697,7 @@ void cgribexDefGrid(int *isec1, int *isec2, double *fsec2, int *isec4, int gridI
if
(
gridtype
==
GRID_GAUSSIAN_REDUCED
)
{
ISEC2_Reduced
=
TRUE
;
ISEC2_Reduced
=
true
;
nlon
=
0
;
gridInqRowlon
(
gridID
,
ISEC2_RowLonPtr
);
}
...
...
src/stream_ext.c
View file @
39366b0c
...
...
@@ -236,7 +236,7 @@ void extScanTimestep1(stream_t *streamptr)
int
fileID
=
streamptr
->
fileID
;
int
nrecs
=
0
;
while
(
TRUE
)
while
(
true
)
{
recpos
=
fileGetPos
(
fileID
);
int
status
=
extRead
(
fileID
,
extp
);
...
...
@@ -320,7 +320,7 @@ void extScanTimestep1(stream_t *streamptr)
if
(
tsID
!=
streamptr
->
rtsteps
)
Error
(
"Internal error. tsID = %d"
,
tsID
);
streamptr
->
tsteps
[
tsID
-
1
].
next
=
TRUE
;
streamptr
->
tsteps
[
tsID
-
1
].
next
=
true
;
streamptr
->
tsteps
[
tsID
].
position
=
recpos
;
}
...
...
@@ -421,7 +421,7 @@ int extScanTimestep2(stream_t *streamptr)
}
else
{
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
TRUE
;
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
true
;
streamptr
->
tsteps
[
tsID
].
recIDs
[
rindex
]
=
recID
;
}
break
;
...
...
@@ -478,7 +478,7 @@ int extScanTimestep2(stream_t *streamptr)
if
(
tsID
!=
streamptr
->
rtsteps
)
Error
(
"Internal error. tsID = %d"
,
tsID
);
streamptr
->
tsteps
[
tsID
-
1
].
next
=
TRUE
;
streamptr
->
tsteps
[
tsID
-
1
].
next
=
true
;
streamptr
->
tsteps
[
tsID
].
position
=
recpos
;
}
...
...
@@ -599,7 +599,7 @@ long extScanTimestep(stream_t *streamptr)
if
(
tsID
!=
streamptr
->
rtsteps
)
Error
(
"Internal error. tsID = %d"
,
tsID
);
streamptr
->
tsteps
[
tsID
-
1
].
next
=
1
;
streamptr
->
tsteps
[
tsID
-
1
].
next
=
true
;
streamptr
->
tsteps
[
tsID
].
position
=
recpos
;
}
...
...
src/stream_gribapi.c
View file @
39366b0c
...
...
@@ -207,7 +207,7 @@ int gribapiGetValidityDateTime(grib_handle *gh, int *vdate, int *vtime)
}
{
static
int
lprint
=
TRUE
;
static
bool
lprint
=
true
;
extern
int
grib_calendar
;
int
ryear
,
rmonth
,
rday
,
rhour
,
rminute
,
rsecond
;
int
julday
,
secofday
;
...
...
@@ -235,7 +235,7 @@ int gribapiGetValidityDateTime(grib_handle *gh, int *vdate, int *vtime)
if
(
lprint
)
{
Warning
(
"Time unit %d unsupported"
,
timeUnits
);
lprint
=
FALSE
;
lprint
=
false
;
}
break
;
}
...
...
@@ -819,8 +819,8 @@ int gribapiScanTimestep1(stream_t * streamptr)
size_t
buffersize
=
0
;
DateTime
datetime0
=
{
.
date
=
10101
,
.
time
=
0
};
int
nrecs_scanned
=
0
;
//Only used for debug output.
int
warn_time
=
TRUE
;
//
int
warn_numavg =
TRUE
;
bool
warn_time
=
true
;
//
bool
warn_numavg =
true
;
int
rdate
=
0
,
rtime
=
0
,
tunit
=
0
,
fcast
=
0
;
grib_handle
*
gh
=
NULL
;
...
...
@@ -835,7 +835,7 @@ int gribapiScanTimestep1(stream_t * streamptr)
int
fileID
=
streamptr
->
fileID
;
unsigned
nrecs
=
0
;
while
(
TRUE
)
while
(
true
)
{
int
level1
=
0
,
level2
=
0
;
size_t
recsize
=
gribGetSize
(
fileID
);
...
...
@@ -905,7 +905,7 @@ int gribapiScanTimestep1(stream_t * streamptr)
else
if
(
result
==
CHECKTIME_INCONSISTENT
&&
warn_time
)
{
gribWarning
(
"Inconsistent verification time!"
,
nrecs_scanned
,
tsID
+
1
,
varname
,
param
,
level1
,
level2
);
warn_time
=
FALSE
;
warn_time
=
false
;
}
assert
(
result
==
CHECKTIME_OK
||
result
==
CHECKTIME_INCONSISTENT
);
}
...
...
@@ -916,7 +916,7 @@ int gribapiScanTimestep1(stream_t * streamptr)
{
Message("Change numavg from %d to %d not allowed!",
taxis->numavg, ISEC1_AvgNum);
warn_numavg =
FALSE
;
warn_numavg =
false
;
}
else
{
...
...
@@ -994,7 +994,7 @@ int gribapiScanTimestep1(stream_t * streamptr)
if
(
tsID
!=
streamptr
->
rtsteps
)
Error
(
"Internal error. tsID = %d"
,
tsID
);
streamptr
->
tsteps
[
tsID
-
1
].
next
=
TRUE
;
streamptr
->
tsteps
[
tsID
-
1
].
next
=
true
;
streamptr
->
tsteps
[
tsID
].
position
=
recpos
;
}
...
...
@@ -1021,7 +1021,7 @@ int gribapiScanTimestep2(stream_t * streamptr)
DateTime
datetime0
=
{
LONG_MIN
,
LONG_MIN
};
// int gridID;
int
recID
;
//
int
warn_numavg =
TRUE
;
//
bool
warn_numavg =
true
;
grib_handle
*
gh
=
NULL
;
streamptr
->
curTsID
=
1
;
...
...
@@ -1057,7 +1057,7 @@ int gribapiScanTimestep2(stream_t * streamptr)
int
nrecs_scanned
=
nrecords
;
//Only used for debug output
int
rindex
=
0
;
while
(
TRUE
)
while
(
true
)
{
if
(
rindex
>
nrecords
)
break
;
...
...
@@ -1122,7 +1122,7 @@ int gribapiScanTimestep2(stream_t * streamptr)
if ( taxis->numavg && warn_numavg &&
(taxis->numavg != ISEC1_AvgNum) )
{
warn_numavg =
FALSE
;
warn_numavg =
false
;
}
else
{
...
...
@@ -1158,7 +1158,7 @@ int gribapiScanTimestep2(stream_t * streamptr)
}
}
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
TRUE
;
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
true
;
streamptr
->
tsteps
[
tsID
].
recIDs
[
rindex
]
=
recID
;
if
(
CDI_Debug
)
...
...
@@ -1225,7 +1225,7 @@ int gribapiScanTimestep2(stream_t * streamptr)
if
(
tsID
!=
streamptr
->
rtsteps
)
Error
(
"Internal error. tsID = %d"
,
tsID
);
streamptr
->
tsteps
[
tsID
-
1
].
next
=
TRUE
;
streamptr
->
tsteps
[
tsID
-
1
].
next
=
true
;
streamptr
->
tsteps
[
tsID
].
position
=
recpos
;
}
...
...
@@ -1239,7 +1239,7 @@ int gribapiScanTimestep2(stream_t * streamptr)
int
gribapiScanTimestep
(
stream_t
*
streamptr
)
{
int
vrecID
,
recID
;
//
int
warn_numavg =
TRUE
;
//
bool
warn_numavg =
true
;
int
nrecs
=
0
;
int
vlistID
=
streamptr
->
vlistID
;
...
...
@@ -1278,7 +1278,7 @@ int gribapiScanTimestep(stream_t * streamptr)
DateTime
datetime0
=
{
LONG_MIN
,
LONG_MIN
};
grib_handle
*
gh
=
NULL
;
char
varname
[
256
];
while
(
TRUE
)
while
(
true
)
{
if
(
rindex
>
nrecs
)
break
;
...
...
@@ -1350,7 +1350,7 @@ int gribapiScanTimestep(stream_t * streamptr)
if ( taxis->numavg && warn_numavg &&
(taxis->numavg != ISEC1_AvgNum) )
{
warn_numavg =
FALSE
;
warn_numavg =
false
;
}
else
{
...
...
@@ -1396,7 +1396,7 @@ int gribapiScanTimestep(stream_t * streamptr)
}
}
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
TRUE
;
streamptr
->
tsteps
[
tsID
].
records
[
recID
].
used
=
true
;
streamptr
->
tsteps
[
tsID
].
recIDs
[
rindex
]
=
recID
;
if
(
CDI_Debug
)
...
...
@@ -1446,7 +1446,7 @@ int gribapiScanTimestep(stream_t * streamptr)
if
(
tsID
!=
streamptr
->
rtsteps
)
Error
(
"Internal error. tsID = %d"
,
tsID
);
streamptr
->
tsteps
[
tsID
-
1
].
next
=
1
;
streamptr
->
tsteps
[
tsID
-
1
].
next
=
true
;
streamptr
->
tsteps
[
tsID
].
position
=
recpos
;
}
...
...
@@ -3112,7 +3112,7 @@ size_t gribapiEncode(int varID, int levelID, int vlistID, int gridID, int zaxisI
{
//DR: Fix for multi-level fields (otherwise only the 1st level is correct)
if
(
zaxisInqSize
(
zaxisID
)
==
(
levelID
+
1
)
)
vlistptr
->
vars
[
varID
].
opt_grib_kvpair
[
i
].
update
=
FALSE
;
vlistptr
->
vars
[
varID
].
opt_grib_kvpair
[
i
].
update
=
false
;
if
(
vlistptr
->
vars
[
varID
].
opt_grib_kvpair
[
i
].
data_type
==
t_double
)
{
...
...
@@ -3161,7 +3161,7 @@ size_t gribapiEncode(int varID, int levelID, int vlistID, int gridID, int zaxisI
gribHandleDelete
(
gh
);
#endif
gc
->
init
=
TRUE
;
gc
->
init
=
true
;
return
recsize
;