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
97c20a1f
Commit
97c20a1f
authored
Jul 15, 2013
by
Uwe Schulzweida
Browse files
cgribexlib update
parent
afca0021
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/cdf.c
View file @
97c20a1f
...
...
@@ -124,8 +124,7 @@ int cdfOpenFile(const char *filename, const char *mode, int *filetype)
#endif
#if defined (HAVE_NETCDF4)
if
(
*
filetype
==
FILETYPE_NC4
)
writemode
|=
NC_NETCDF4
;
else
if
(
*
filetype
==
FILETYPE_NC4C
)
writemode
|=
NC_NETCDF4
|
NC_CLASSIC_MODEL
;
else
if
(
*
filetype
==
FILETYPE_NC4C
)
writemode
|=
NC_NETCDF4
|
NC_CLASSIC_MODEL
;
#endif
cdf_create
(
filename
,
writemode
,
&
ncid
);
cdfComment
(
ncid
);
...
...
src/cdf_int.c
View file @
97c20a1f
...
...
@@ -255,8 +255,7 @@ cdf_def_var_serial(int ncid, const char *name, nc_type xtype, int ndims,
Message
(
"ncid = %d name = %s xtype = %d ndims = %d varid = %d"
,
ncid
,
name
,
xtype
,
ndims
,
*
varidp
);
if
(
status
!=
NC_NOERR
)
Error
(
"%s"
,
nc_strerror
(
status
));
if
(
status
!=
NC_NOERR
)
Error
(
"%s"
,
nc_strerror
(
status
));
}
...
...
src/cgribex.h
View file @
97c20a1f
...
...
@@ -182,11 +182,11 @@ void gribSetValueCheck(int vcheck);
void
gribExSP
(
int
*
isec0
,
int
*
isec1
,
int
*
isec2
,
float
*
fsec2
,
int
*
isec3
,
float
*
fsec3
,
int
*
isec4
,
float
*
fsec4
,
int
klenp
,
int
*
kgrib
,
int
kleng
,
int
*
kword
,
char
hoper
,
int
*
kret
);
int
kleng
,
int
*
kword
,
char
*
hoper
,
int
*
kret
);
void
gribExDP
(
int
*
isec0
,
int
*
isec1
,
int
*
isec2
,
double
*
fsec2
,
int
*
isec3
,
double
*
fsec3
,
int
*
isec4
,
double
*
fsec4
,
int
klenp
,
int
*
kgrib
,
int
kleng
,
int
*
kword
,
char
hoper
,
int
*
kret
);
int
kleng
,
int
*
kword
,
char
*
hoper
,
int
*
kret
);
const
char
*
cgribexLibraryVersion
(
void
);
...
...
src/cgribexlib.c
View file @
97c20a1f
...
...
@@ -24,8 +24,6 @@
#include
"calendar.h"
#include
"timebase.h"
#include
"pio_util.h"
#ifndef _GRIB_INT_H
#define _GRIB_INT_H
...
...
@@ -117,7 +115,7 @@
double
intpow2
(
int
x
);
static
int
gribrec_len
(
int
b1
,
int
b2
,
int
b3
);
int
gribrec_len
(
int
b1
,
int
b2
,
int
b3
);
int
correct_bdslen
(
int
bdslen
,
long
recsize
,
long
gribpos
);
/* CDI converter routines */
...
...
@@ -2803,9 +2801,9 @@ void gprintf(const char *caller, const char *fmt, ...)
void
gribExDP
(
int
*
isec0
,
int
*
isec1
,
int
*
isec2
,
double
*
fsec2
,
int
*
isec3
,
double
*
fsec3
,
int
*
isec4
,
double
*
fsec4
,
int
klenp
,
int
*
kgrib
,
int
kleng
,
int
*
kword
,
char
hoper
,
int
*
kret
)
int
kleng
,
int
*
kword
,
char
*
hoper
,
int
*
kret
)
{
int
yfunc
=
hoper
;
int
yfunc
=
*
hoper
;
if
(
yfunc
==
'C'
)
gribEncode
(
isec0
,
isec1
,
isec2
,
fsec2
,
isec3
,
...
...
@@ -2828,13 +2826,13 @@ gribExDP(int *isec0, int *isec1, int *isec2, double *fsec2, int *isec3,
void
gribExSP
(
int
*
isec0
,
int
*
isec1
,
int
*
isec2
,
float
*
fsec2sp
,
int
*
isec3
,
float
*
fsec3sp
,
int
*
isec4
,
float
*
fsec4sp
,
int
klenp
,
int
*
kgrib
,
int
kleng
,
int
*
kword
,
char
hoper
,
int
*
kret
)
int
kleng
,
int
*
kword
,
char
*
hoper
,
int
*
kret
)
{
int
inum
,
j
;
double
fsec2dp
[
1024
];
double
fsec3dp
[
2
];
double
*
fsec4dp
=
NULL
;
int
yfunc
=
hoper
;
int
yfunc
=
*
hoper
;
if
(
yfunc
==
'C'
)
{
...
...
@@ -2850,8 +2848,6 @@ gribExSP(int *isec0, int *isec1, int *isec2, float *fsec2sp, int *isec3,
for
(
j
=
0
;
j
<
inum
;
j
++
)
fsec4dp
[
j
]
=
fsec4sp
[
j
];
printf
(
"########## %s, %s, %d
\n
"
,
__FILE__
,
__func__
,
__LINE__
);
gribExDP
(
isec0
,
isec1
,
isec2
,
fsec2dp
,
isec3
,
fsec3dp
,
isec4
,
fsec4dp
,
klenp
,
kgrib
,
kleng
,
kword
,
hoper
,
kret
);
...
...
@@ -2866,8 +2862,6 @@ gribExSP(int *isec0, int *isec1, int *isec2, float *fsec2sp, int *isec3,
for
(
j
=
0
;
j
<
10
;
j
++
)
fsec2dp
[
j
]
=
0
.
0
;
for
(
j
=
0
;
j
<
2
;
j
++
)
fsec3dp
[
j
]
=
0
.
0
;
printf
(
"########## %s, %s, %d
\n
"
,
__FILE__
,
__func__
,
__LINE__
);
gribExDP
(
isec0
,
isec1
,
isec2
,
fsec2dp
,
isec3
,
fsec3dp
,
isec4
,
fsec4dp
,
klenp
,
kgrib
,
kleng
,
kword
,
hoper
,
kret
);
...
...
@@ -4942,7 +4936,7 @@ void encodeBMS(GRIBPACK *lGrib, long *gribLen, double *fsec3, int *isec4, double
long
bmsLen
,
bmsUnusedBits
;
long
fsec4size
;
long
z
=
*
gribLen
;
#ifdef
VECTORCODE
#if
def
ined (
VECTORCODE
)
unsigned
int
*
imask
;
#endif
static
int
lmissvalinfo
=
1
;
...
...
@@ -6626,6 +6620,7 @@ int gribOpen(const char *filename, const char *mode)
fileSetBufferType
(
fileID
,
FILE_BUFTYPE_MMAP
);
}
#endif
return
(
fileID
);
}
...
...
@@ -7063,7 +7058,7 @@ int gribWrite(int fileID, unsigned char *buffer, size_t buffersize)
}
static
int
gribrec_len
(
int
b1
,
int
b2
,
int
b3
)
int
gribrec_len
(
int
b1
,
int
b2
,
int
b3
)
{
int
gribsize
;
...
...
src/stream_cgribex.c
View file @
97c20a1f
...
...
@@ -14,7 +14,6 @@
#include
"vlist.h"
#include
"stream_grb.h"
#if defined (HAVE_LIBCGRIBEX)
# include "cgribex.h"
#endif
...
...
@@ -501,7 +500,7 @@ void cgribexDecodeHeader(int *isec0, int *isec1, int *isec2, double *fsec2,
memset
(
isec1
,
0
,
256
*
sizeof
(
int
));
gribExDP
(
isec0
,
isec1
,
isec2
,
fsec2
,
isec3
,
fsec3
,
isec4
,
fsec4
,
ipunp
,
(
int
*
)
gribbuffer
,
recsize
,
&
iword
,
'J'
,
iret
);
ipunp
,
(
int
*
)
gribbuffer
,
recsize
,
&
iword
,
"J"
,
iret
);
*
lmv
=
0
;
...
...
@@ -1341,12 +1340,12 @@ int cgribexDecode(unsigned char *gribbuffer, int gribsize, double *data, int gri
int
izip
;
long
unzipsize
;
double
fsec2
[
512
],
fsec3
[
2
];
char
hoper
;
char
hoper
[
2
]
;
*
zip
=
0
;
if
(
unreduced
)
hoper
=
'R'
;
else
hoper
=
'D'
;
if
(
unreduced
)
strcpy
(
hoper
,
"R"
)
;
else
strcpy
(
hoper
,
"D"
)
;
FSEC3_MissVal
=
missval
;
...
...
@@ -1388,7 +1387,6 @@ int cgribexDecode(unsigned char *gribbuffer, int gribsize, double *data, int gri
}
}
gribExDP
(
isec0
,
isec1
,
isec2
,
fsec2
,
isec3
,
fsec3
,
isec4
,
data
,
gridsize
,
(
int
*
)
gribbuffer
,
gribsize
,
&
iword
,
hoper
,
&
iret
);
...
...
@@ -2261,7 +2259,7 @@ size_t cgribexEncode(int varID, int levelID, int vlistID, int gridID, int zaxisI
//printf("isec4[16] %d\n", isec4[16]);
gribExDP
(
isec0
,
isec1
,
isec2
,
fsec2
,
isec3
,
fsec3
,
isec4
,
(
double
*
)
data
,
datasize
,
(
int
*
)
gribbuffer
,
gribsize
,
&
iword
,
'C'
,
&
iret
);
datasize
,
(
int
*
)
gribbuffer
,
gribsize
,
&
iword
,
"C"
,
&
iret
);
if
(
iret
)
Error
(
"Problem during GRIB encode (errno = %d)!"
,
iret
);
...
...
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