No commit message

No commit message

config/default

@@ -24,6 +24,7 @@ case "${HOSTNAME}" in
                     --with-jasper=/usr \
                     --with-grib_api=$HOME/local \
                     --with-netcdf=$HOME/local \
+                    --with-hdf5=$HOME/local \
                     --with-szlib=$HOME/local \
                     CC=gcc CFLAGS="-g -O2 -Wall -W -Wfloat-equal -pedantic" CFINT=-Df2cFortran
 	;;

src/cgribexlib.c

 
-/* Automatically generated by m214003 at 2009-09-13, do not edit */
+/* Automatically generated by m214003 at 2009-10-17, do not edit */
 
-/* CGRIBEXLIB_VERSION="1.4.0" */
+/* CGRIBEXLIB_VERSION="1.4.0.1" */
 
 #if defined (HAVE_CONFIG_H)
 #  include "config.h"
@@ -1155,7 +1155,7 @@ gribExDP(int *isec0, int *isec1, int *isec2, double *fsec2, int *isec3,
 	       fsec3, isec4, fsec4, klenp, kgrib,
 	       kleng, kword, yfunc, kret);
   else if ( yfunc == 'V' )
-    fprintf(stderr, " c_gribex: Version is %s\n", cgribexLibraryVersion());
+    fprintf(stderr, "  cgribex: Version is %s\n", cgribexLibraryVersion());
   else
     {
       Error(func, "oper %c unsupported\n", yfunc);
@@ -4953,6 +4953,7 @@ void gribDecode(int *isec0, int *isec1, int *isec2, double *fsec2, int *isec3,
       if ( dfunc != 'J' || bitmapSize == ISEC4_NumNonMissValues )
 	{
 	  long i, j;
+	  GRIBPACK *pbitmap;
 	  GRIBPACK bitmap;
 	  GRIBPACK *imask;
 
@@ -4969,12 +4970,13 @@ void gribDecode(int *isec0, int *isec1, int *isec2, double *fsec2, int *isec3,
 	    }
 	  */
 
-#if defined (VECTORCODE)
 	  imask = (GRIBPACK *) malloc(imaskSize*sizeof(GRIBPACK));
 
+#if defined (VECTORCODE)
 	  (void) UNPACK_GRIB(BMS_Bitmap, imask, imaskSize/8, -1L);
+	  pbitmap = imask;
 #else
-	  imask = BMS_Bitmap;
+	  pbitmap = BMS_Bitmap;
 #endif
 
 #if defined (CRAY)
@@ -4988,7 +4990,7 @@ void gribDecode(int *isec0, int *isec1, int *isec2, double *fsec2, int *isec3,
 #endif
 	  for ( i = imaskSize/8-1; i >= 0; i-- )
 	    {
-	      bitmap = imask[i];
+	      bitmap = pbitmap[i];
 	      imask[i*8+0] = 1 & (bitmap >> 7);
 	      imask[i*8+1] = 1 & (bitmap >> 6);
 	      imask[i*8+2] = 1 & (bitmap >> 5);
@@ -5027,9 +5029,7 @@ void gribDecode(int *isec0, int *isec1, int *isec2, double *fsec2, int *isec3,
 		fsec4[i] = imask[i] ? fsec4[--j] : FSEC3_MissVal;
 	    }
 
-#if defined (VECTORCODE)
 	  free(imask);
-#endif
 	}
     }
 
@@ -8878,7 +8878,7 @@ int  gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu
 
   return (gribLen);
 }
-static const char grb_libvers[] = "1.4.0" " of ""Sep 13 2009"" ""15:39:58";
+static const char grb_libvers[] = "1.4.0.1" " of ""Oct 17 2009"" ""08:09:19";
 const char *
 cgribexLibraryVersion(void)
 {

src/stream.c

@@ -1910,7 +1910,7 @@ void cdiPrintVersion(void)
 {
   fprintf(stderr, "     CDI library version : %s\n", cdiLibraryVersion());
 #if  defined  (HAVE_LIBGRIB)
-  fprintf(stderr, "C_GRIBEX library version : %s\n", cgribexLibraryVersion());
+  fprintf(stderr, " CGRIBEX library version : %s\n", cgribexLibraryVersion());
 #endif
 #if  defined  (HAVE_LIBGRIB_API)
   fprintf(stderr, "GRIB_API library version : %s\n", gribapiLibraryVersion());

src/stream_cdf.c

@@ -608,6 +608,7 @@ void cdfDefVarDeflate(int ncid, int ncvarid, int deflate_level)
 #endif
 
 #if  defined  (HAVE_LIBNETCDF)
+
 static
 void cdfDefVarSzip(int ncid, int ncvarid)
 {
@@ -615,7 +616,7 @@ void cdfDefVarSzip(int ncid, int ncvarid)
 #if  defined  (NC_NETCDF4) && defined (NC_SZIP_NN_OPTION_MASK)
   int retval;
   /* Set options_mask and bits_per_pixel. */
-  int options_mask = 32;
+  int options_mask = NC_SZIP_NN_OPTION_MASK;
   int bits_per_pixel = 16;
 
   if ((retval = nc_def_var_szip(ncid, ncvarid, options_mask, bits_per_pixel)))