Commit 244b8063 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

cgribexlib update

parent 579d6752
/* Automatically generated by m214003 at 2016-02-03, do not edit */ /* Automatically generated by m214003 at 2016-02-19, do not edit */
/* CGRIBEXLIB_VERSION="1.7.4" */ /* CGRIBEXLIB_VERSION="1.7.4" */
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
#define TEMPLATE(X,Y) CAT(X,Y) #define TEMPLATE(X,Y) CAT(X,Y)
#endif #endif
#ifndef _GRIB_INT_H #ifndef GRIB_INT_H
#define _GRIB_INT_H #define GRIB_INT_H
#if defined (HAVE_CONFIG_H) #if defined (HAVE_CONFIG_H)
# include "config.h" # include "config.h"
...@@ -222,7 +222,7 @@ int grib2Sections(unsigned char *gribbuffer, long gribbufsize, unsigned char **i ...@@ -222,7 +222,7 @@ int grib2Sections(unsigned char *gribbuffer, long gribbufsize, unsigned char **i
} }
#endif #endif
#endif /* _GRIB_INT_H */ #endif /* GRIB_INT_H */
#ifndef _GRIBDECODE_H #ifndef _GRIBDECODE_H
#define _GRIBDECODE_H #define _GRIBDECODE_H
...@@ -9491,7 +9491,7 @@ int TEMPLATE(decodeGDS,T)(unsigned char *gds, int *isec0, int *isec2, T *fsec2, ...@@ -9491,7 +9491,7 @@ int TEMPLATE(decodeGDS,T)(unsigned char *gds, int *isec0, int *isec2, T *fsec2,
imant =((lgrib[4*i+1]) << 16) + imant =((lgrib[4*i+1]) << 16) +
((lgrib[4*i+2]) << 8) + ((lgrib[4*i+2]) << 8) +
(lgrib[4*i+3]); (lgrib[4*i+3]);
fsec2[10+i] = POW_2_M24 * imant * pow(16.0, (double)(iexp - 64)); fsec2[10+i] = POW_2_M24 * imant * ldexp(1.0, 4 * (iexp - 64));
} }
Free(lgrib); Free(lgrib);
...@@ -9772,9 +9772,7 @@ int TEMPLATE(decodeBDS,T)(int decscale, unsigned char *bds, int *isec2, int *ise ...@@ -9772,9 +9772,7 @@ int TEMPLATE(decodeBDS,T)(int decscale, unsigned char *bds, int *isec2, int *ise
if ( lspherc && lcomplex ) if ( lspherc && lcomplex )
{ {
int pcStart, pcScale; int pcStart = isec4[19], pcScale = isec4[16];
pcStart = isec4[19];
pcScale = isec4[16];
TEMPLATE(scatter_complex,T)(fsec4, pcStart, ISEC2_PentaJ, ISEC4_NumValues); TEMPLATE(scatter_complex,T)(fsec4, pcStart, ISEC2_PentaJ, ISEC4_NumValues);
TEMPLATE(scale_complex,T)(fsec4, pcStart, pcScale, ISEC2_PentaJ, 1); TEMPLATE(scale_complex,T)(fsec4, pcStart, pcScale, ISEC2_PentaJ, 1);
} }
...@@ -10414,7 +10412,7 @@ int TEMPLATE(decodeGDS,T)(unsigned char *gds, int *isec0, int *isec2, T *fsec2, ...@@ -10414,7 +10412,7 @@ int TEMPLATE(decodeGDS,T)(unsigned char *gds, int *isec0, int *isec2, T *fsec2,
imant =((lgrib[4*i+1]) << 16) + imant =((lgrib[4*i+1]) << 16) +
((lgrib[4*i+2]) << 8) + ((lgrib[4*i+2]) << 8) +
(lgrib[4*i+3]); (lgrib[4*i+3]);
fsec2[10+i] = POW_2_M24 * imant * pow(16.0, (double)(iexp - 64)); fsec2[10+i] = POW_2_M24 * imant * ldexp(1.0, 4 * (iexp - 64));
} }
Free(lgrib); Free(lgrib);
...@@ -10695,9 +10693,7 @@ int TEMPLATE(decodeBDS,T)(int decscale, unsigned char *bds, int *isec2, int *ise ...@@ -10695,9 +10693,7 @@ int TEMPLATE(decodeBDS,T)(int decscale, unsigned char *bds, int *isec2, int *ise
if ( lspherc && lcomplex ) if ( lspherc && lcomplex )
{ {
int pcStart, pcScale; int pcStart = isec4[19], pcScale = isec4[16];
pcStart = isec4[19];
pcScale = isec4[16];
TEMPLATE(scatter_complex,T)(fsec4, pcStart, ISEC2_PentaJ, ISEC4_NumValues); TEMPLATE(scatter_complex,T)(fsec4, pcStart, ISEC2_PentaJ, ISEC4_NumValues);
TEMPLATE(scale_complex,T)(fsec4, pcStart, pcScale, ISEC2_PentaJ, 1); TEMPLATE(scale_complex,T)(fsec4, pcStart, pcScale, ISEC2_PentaJ, 1);
} }
...@@ -12815,8 +12811,8 @@ int TEMPLATE(encodeBDS,T)(GRIBPACK *lGrib, long *gribLen, int decscale, int *ise ...@@ -12815,8 +12811,8 @@ int TEMPLATE(encodeBDS,T)(GRIBPACK *lGrib, long *gribLen, int decscale, int *ise
{ {
/* If section 2 is present, it says if data is spherical harmonic */ /* If section 2 is present, it says if data is spherical harmonic */
if ( isec2[0] == 50 || isec2[0] == 60 || lspherc = ( isec2[0] == 50 || isec2[0] == 60 ||
isec2[0] == 70 || isec2[0] == 80 ) lspherc = TRUE; isec2[0] == 70 || isec2[0] == 80 );
if ( lspherc ) if ( lspherc )
isec4[2] = 128; isec4[2] = 128;
...@@ -13431,8 +13427,8 @@ int TEMPLATE(encodeBDS,T)(GRIBPACK *lGrib, long *gribLen, int decscale, int *ise ...@@ -13431,8 +13427,8 @@ int TEMPLATE(encodeBDS,T)(GRIBPACK *lGrib, long *gribLen, int decscale, int *ise
{ {
/* If section 2 is present, it says if data is spherical harmonic */ /* If section 2 is present, it says if data is spherical harmonic */
if ( isec2[0] == 50 || isec2[0] == 60 || lspherc = ( isec2[0] == 50 || isec2[0] == 60 ||
isec2[0] == 70 || isec2[0] == 80 ) lspherc = TRUE; isec2[0] == 70 || isec2[0] == 80 );
if ( lspherc ) if ( lspherc )
isec4[2] = 128; isec4[2] = 128;
...@@ -13788,7 +13784,7 @@ void encode_dummy(void) ...@@ -13788,7 +13784,7 @@ void encode_dummy(void)
(void) encode_array_unrolled_double(0, 0, 0, NULL, NULL, 0, 0, NULL); (void) encode_array_unrolled_double(0, 0, 0, NULL, NULL, 0, 0, NULL);
(void) encode_array_unrolled_float(0, 0, 0, NULL, NULL, 0, 0, NULL); (void) encode_array_unrolled_float(0, 0, 0, NULL, NULL, 0, 0, NULL);
} }
static const char grb_libvers[] = "1.7.4" " of ""Feb 3 2016"" ""13:45:03"; static const char grb_libvers[] = "1.7.4" " of ""Feb 19 2016"" ""11:03:41";
const char * const char *
cgribexLibraryVersion(void) cgribexLibraryVersion(void)
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment