cgribexlib update

ChangeLog

-2015-02-12  Uwe Schulzweida
+2015-03-12  Uwe Schulzweida
 
 	* Version 1.6.8 released
+        * using CGRIBEX library version 1.7.1
 
 2015-02-12  Uwe Schulzweida
 

src/cgribexlib.c

 
-/* Automatically generated by m214003 at 2014-12-03, do not edit */
+/* Automatically generated by m214003 at 2015-02-22, do not edit */
 
-/* CGRIBEXLIB_VERSION="1.7.0" */
+/* CGRIBEXLIB_VERSION="1.7.1" */
 
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5)
 #pragma GCC diagnostic push
@@ -1404,7 +1404,7 @@ void avx_encode_array_2byte_double(size_t datasize,
 
   for (i = 0; i < (datasize-residual); i += 16)
     {
-      (void) _mm_prefetch(dval+8, _MM_HINT_NTA);
+      (void) _mm_prefetch((const char*)(dval+8), _MM_HINT_NTA);
       //_____________________________________________________________________________
 
       d0 = _mm256_loadu_pd (dval);
@@ -1431,7 +1431,7 @@ void avx_encode_array_2byte_double(size_t datasize,
 
       //_____________________________________________________________________________
 
-      (void) _mm_prefetch(dval+16, _MM_HINT_NTA);
+      (void) _mm_prefetch((const char*)(dval+16), _MM_HINT_NTA);
 
       //_____________________________________________________________________________
       
@@ -1479,6 +1479,8 @@ void avx_encode_array_2byte_double(size_t datasize,
   return;
 }
 
+#define grib_encode_array_2byte_double avx_encode_array_2byte_double
+
 #elif defined _ENABLE_SSE4_1
 
 static
@@ -1608,6 +1610,12 @@ void sse41_encode_array_2byte_double(size_t datasize,
   return;
 }
 
+#define grib_encode_array_2byte_double sse41_encode_array_2byte_double
+
+#else
+
+#define grib_encode_array_2byte_double encode_array_2byte_double
+
 #endif // SIMD variants
 
 
@@ -12166,13 +12174,7 @@ void TEMPLATE(encode_array,T)(int numBits, size_t packStart, size_t datasize,
 
       if ( sizeof(T) == sizeof(double) )
       	{ 
-#if defined _ENABLE_AVX
-          avx_encode_array_2byte_double(datasize, lGrib, data, zref, factor, &z);
-#elif defined _ENABLE_SSE4_1
-          sse41_encode_array_2byte_double(datasize, lGrib, data, zref, factor, &z);
-#else
-          TEMPLATE(encode_array_2byte,T)(datasize, lGrib, data, zref, factor, &z);
-#endif
+          grib_encode_array_2byte_double(datasize, lGrib, data, zref, factor, &z);
         }
       else
         {
@@ -12643,13 +12645,7 @@ void TEMPLATE(encode_array,T)(int numBits, size_t packStart, size_t datasize,
 
       if ( sizeof(T) == sizeof(double) )
       	{ 
-#if defined _ENABLE_AVX
-          avx_encode_array_2byte_double(datasize, lGrib, data, zref, factor, &z);
-#elif defined _ENABLE_SSE4_1
-          sse41_encode_array_2byte_double(datasize, lGrib, data, zref, factor, &z);
-#else
-          TEMPLATE(encode_array_2byte,T)(datasize, lGrib, data, zref, factor, &z);
-#endif
+          grib_encode_array_2byte_double(datasize, lGrib, data, zref, factor, &z);
         }
       else
         {
@@ -14224,7 +14220,7 @@ void encode_dummy(void)
   (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);
 }
-static const char grb_libvers[] = "1.7.0" " of ""Dec  3 2014"" ""08:52:12";
+static const char grb_libvers[] = "1.7.1" " of ""Feb 22 2015"" ""10:52:27";
 const char *
 cgribexLibraryVersion(void)
 {