using complex packing only for res >= t21

ChangeLog

+2010-02-22  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* Version 1.4.3 released
+
 2010-02-18  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
 
-	* grib1: bug fix for description of gaussian reduced grids [report: Kaus Wyser]
+	* grib1: bug fix for description of gaussian reduced grids [report: Klaus Wyser]
 
 2010-02-16  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
 

src/cdi.inc

 ! This file was automatically created, don't edit!
 !
-! Fortran interface for CDI library version 1.4.1
+! Fortran interface for CDI library version 1.4.3
 !
 ! Author:
 ! -------
@@ -1469,6 +1469,15 @@
 !                                     INTEGER         gridtype)
       EXTERNAL        gridChangeType
 
+!                     gridDefComplexPacking
+!                                    (INTEGER         gridID,
+!                                     INTEGER         lpack)
+      EXTERNAL        gridDefComplexPacking
+
+      INTEGER         gridInqComplexPacking
+!                                    (INTEGER         gridID)
+      EXTERNAL        gridInqComplexPacking
+
 !
 !  ZAXIS routines
 !

src/cdiFortran.c

@@ -307,6 +307,8 @@ FCALLSCFUN2 (INT, gridInqYbounds, GRIDINQYBOUNDS, gridinqybounds, INT, PDOUBLE)
 FCALLSCSUB3 (gridDefRowlon, GRIDDEFROWLON, griddefrowlon, INT, INT, PINT)
 FCALLSCSUB2 (gridInqRowlon, GRIDINQROWLON, gridinqrowlon, INT, PINT)
 FCALLSCSUB2 (gridChangeType, GRIDCHANGETYPE, gridchangetype, INT, INT)
+FCALLSCSUB2 (gridDefComplexPacking, GRIDDEFCOMPLEXPACKING, griddefcomplexpacking, INT, INT)
+FCALLSCFUN1 (INT, gridInqComplexPacking, GRIDINQCOMPLEXPACKING, gridinqcomplexpacking, INT)
 
 /*  ZAXIS routines  */
 

src/dmemory.c

@@ -12,7 +12,7 @@
 
 #if ! defined (HAVE_CONFIG_H)
 #if ! defined (HAVE_MALLOC_H)
-#  if defined defined (SX)
+#  if defined (SX)
 #    define  HAVE_MALLOC_H
 #  endif
 #endif

src/stream_cgribex.c

@@ -1845,7 +1845,7 @@ void cgribexDefGrid(int *isec1, int *isec2, int *isec4, int gridID)
 	ISEC2_PentaM   = ISEC2_PentaJ;
 	ISEC2_RepType  = 1;
 	isec4[2]       = 128;
-	if ( gridInqComplexPacking(gridID) )
+	if ( gridInqComplexPacking(gridID) && ISEC2_PentaJ >= 21 )
 	  {
 	    ISEC2_RepMode  = 2;
 	    isec4[3]       = 64;