cgribexlib update

src/cgribexlib.c

 
-/* Automatically generated by m214003 at 2013-03-05, do not edit */
+/* Automatically generated by m214003 at 2013-06-27, do not edit */
 
-/* CGRIBEXLIB_VERSION="1.6.0" */
+/* CGRIBEXLIB_VERSION="1.6.1" */
 
 #ifdef _ARCH_PWR6
 #pragma options nostrict
@@ -15,6 +15,7 @@
 #include <ctype.h>
 #include <stdarg.h>
 #include <sys/types.h>
+#include <inttypes.h>
 
 
 #include "file.h"
@@ -1027,7 +1028,7 @@ void avx_encode_double_array_2byte(size_t datasize,
 				   const double * restrict data, 
 				   double zref, double factor, size_t *gz) 
 {
-  size_t i, j;
+  size_t i, j, residual;
   const double *dval = data;
   __m128i *sgrib = (__m128i *) (lGrib+(*gz));
 
@@ -1041,7 +1042,9 @@ void avx_encode_double_array_2byte(size_t datasize,
   __m128i i0, i1, i2, i3;
   __m128i s0, s1;  
 
-  for (i = 0; i < datasize; i += 16)
+  residual = datasize % 16;
+
+  for (i = 0; i < (datasize-residual); i += 16)
     {
       (void) _mm_prefetch(dval+8, _MM_HINT_NTA);
       //_____________________________________________________________________________
@@ -1105,7 +1108,6 @@ void avx_encode_double_array_2byte(size_t datasize,
   if (i != datasize)
     {
       uint16_t ui16;
-      i -= 16;
       for ( j = i; j < datasize; j++ )
 	{
 	  ui16 = (uint16_t) ((data[j] - zref) * factor + 0.5);
@@ -1127,7 +1129,7 @@ void sse41_encode_double_array_2byte(size_t datasize,
 				     const double * restrict data, 
 				     double zref, double factor, size_t *gz) 
 {
-  size_t i, j;
+  size_t i, j, residual;
   const double *dval = data;
   __m128i *sgrib = (__m128i *) (lGrib+(*gz));
 
@@ -1141,7 +1143,9 @@ void sse41_encode_double_array_2byte(size_t datasize,
   __m128i i0, i1, i2, i3, i4;
   __m128i s0, s1;  
 
-  for (i = 0; i < datasize; i += 16)
+  residual = datasize % 16;
+
+  for (i = 0; i < (datasize-residual); i += 16)
     {
       (void) _mm_prefetch(dval+8, _MM_HINT_NTA);
       //_____________________________________________________________________________
@@ -1233,7 +1237,6 @@ void sse41_encode_double_array_2byte(size_t datasize,
   if (i != datasize) 
     {
       uint16_t ui16;
-      i -= 16;  
       for ( j = i; j < datasize; j++ )
 	{
 	  ui16 = (uint16_t) ((data[j] - zref) * factor + 0.5);
@@ -10519,7 +10522,7 @@ int  gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu
 
   return (gribLen);
 }
-static const char grb_libvers[] = "1.6.0" " of ""Mar  5 2013"" ""11:10:25";
+static const char grb_libvers[] = "1.6.1" " of ""Jun 27 2013"" ""15:38:33";
 const char *
 cgribexLibraryVersion(void)
 {