core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26 from schickj/develop 

We have new adaptions for the NEC HPC.
This commit is contained in:
shahramn 2020-06-25 14:44:22 +01:00 committed by GitHub
parent 93911a8830 f7a05d6e79
commit 57614a8d94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/grib_bits_any_endian_vector.c
View File

@ -19,7 +19,8 @@ int grib_decode_long_array(const unsigned char* p, long* bitp, long bitsPerValue
long i = 0; long i = 0;
unsigned long lvalue = 0; unsigned long lvalue = 0;
if (bitsPerValue % 8) { /* if (bitsPerValue % 8) { */
if (bitsPerValue % 8 || (*bitp & 7)) {
int j = 0; int j = 0;
for (i = 0; i < n_vals; i++) { for (i = 0; i < n_vals; i++) {
lvalue = 0; lvalue = 0;
@ -113,17 +114,50 @@ int grib_encode_double_array(size_t n_vals, const double* val, long bits_per_val
} }
} }
else { else {
for (i = 0; i < n_vals; i++) { if (bits_per_value == 16 && !((uint64_t)p&3)) {
int blen = 0; uint32_t *encoded4byte = (uint32_t *) p;
blen = bits_per_value; uint32_t tmp;
unsigned_val = (unsigned long)((((val[i] * d) - reference_value) * divisor) + 0.5); unsigned long unsigned_val2 = 0;
while (blen >= 8) { for(i = 0; i < n_vals - 1; i+=2){
blen -= 8; unsigned_val = (unsigned long)((((val[i]*d)-reference_value)*divisor)+0.5);
*encoded = (unsigned_val >> blen); unsigned_val2 = (unsigned long)((((val[i+1]*d)-reference_value)*divisor)+0.5);
encoded++; tmp = (unsigned_val2 & 0xff);
*off += 8; tmp = (tmp << 8) + (unsigned_val2 >> 8 & 0xff);
} tmp = (tmp << 8) + (unsigned_val & 0xff);
tmp = (tmp << 8) + ((unsigned_val >> 8) & 0xff);
*encoded4byte = tmp;
encoded4byte++;
*off+=32;
} }
/* remainder */
if (n_vals % 2) {
int blen = 0;
i = n_vals-1;
encoded = (unsigned char *) encoded4byte;
blen = bits_per_value;
unsigned_val = (unsigned long)((((val[i]*d)-reference_value)*divisor)+0.5);
while(blen >= 8)
{
blen -= 8;
*encoded = (unsigned_val >> blen);
encoded++;
*off+=8;
}
}
}
else {
for (i = 0; i < n_vals; i++) {
int blen = 0;
blen = bits_per_value;
unsigned_val = (unsigned long)((((val[i] * d) - reference_value) * divisor) + 0.5);
while (blen >= 8) {
blen -= 8;
*encoded = (unsigned_val >> blen);
encoded++;
*off += 8;
}
}
}
} }
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }