cdilib update

src/cgribexlib.c

 
-/* Automatically generated by m214003 at 2010-02-15, do not edit */
+/* Automatically generated by m214003 at 2010-02-18, do not edit */
 
 /* CGRIBEXLIB_VERSION="1.4.3" */
 
@@ -4451,8 +4451,8 @@ void decode_double_array(unsigned char *igrib, long jlend, long jlenc, int NumBi
   else if ( NumBits == 32 )
     for ( i = 0; i < jlend; i++ )
       {
-	dval = (((int)lgrib[4*i  ] << 24) + ((int)lgrib[4*i+1] << 16) +
-		((int)lgrib[4*i+2] <<  8) +  (int)lgrib[4*i+3]);
+	dval = (((unsigned int)lgrib[4*i  ] << 24) + ((unsigned int)lgrib[4*i+1] << 16) +
+		((unsigned int)lgrib[4*i+2] <<  8) +  (unsigned int)lgrib[4*i+3]);
 	fpdata[i] = fmin + zscale * dval;
       }
   else if ( NumBits <= 25 )
@@ -8853,7 +8853,7 @@ int  gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu
 
   return (gribLen);
 }
-static const char grb_libvers[] = "1.4.3" " of ""Feb 15 2010"" ""13:50:31";
+static const char grb_libvers[] = "1.4.3" " of ""Feb 18 2010"" ""11:24:41";
 const char *
 cgribexLibraryVersion(void)
 {

src/stream_gribapi.c

@@ -2062,9 +2062,17 @@ void gribapiDefGrid(grib_handle *gh, int gridID, int ljpeg)
 
 	if ( gridInqComplexPacking(gridID) )
 	  {
-	    mesg = "spectral_complex"; len = strlen(mesg);
+	    static int lwarncomplex = 1;
+	    if ( lwarncomplex )
+	      {
+		Warning(func, "GRIB2 complex packing not implemented, using simple packing!");
+		lwarncomplex = 0;
+	      }
+	    mesg = "spectral_simple"; len = strlen(mesg);
 	    GRIB_CHECK(grib_set_string(gh, "typeOfPacking", mesg, &len), 0);
 	    /*
+	    mesg = "spectral_complex"; len = strlen(mesg);
+	    GRIB_CHECK(grib_set_string(gh, "typeOfPacking", mesg, &len), 0);
 	    GRIB_CHECK(grib_set_long(gh, "JS", 20), 0);
 	    GRIB_CHECK(grib_set_long(gh, "KS", 20), 0);
 	    GRIB_CHECK(grib_set_long(gh, "MS", 20), 0);