[NCF-272]

re: e support ZCL-340681 and CPW-270700

HDF4 supports compression (and chunking)
but the chunking was not being recorded
for HDF4 files. So, I modified the necessary
files to support HDF4 chunking.

include/netcdf.h

@@ -76,7 +76,7 @@ extern "C" {
 #define NC_FILL_UINT    (4294967295U)
 #define NC_FILL_INT64   ((long long)-9223372036854775806LL)
 #define NC_FILL_UINT64  ((unsigned long long)18446744073709551614ULL)
-#define NC_FILL_STRING  (char *)""
+#define NC_FILL_STRING  ((char *)"")
 /**@}*/
 
 /*! Max or min values for a type. Nothing greater/smaller can be

libdap2/env

@@ -6,8 +6,7 @@ alias q0=;alias qq=;alias qv=;alias q=;alias  qh=;alias qqh=;alias qall=;alias q
 #TOP="/home/dmh/mach/netcdf-c"
 TOP="/cygdrive/f/git/netcdf-c"
 
-F="http://thredds.ucar.edu/thredds/dodsC/grib/NCEP/NAM/CONUS_12km/best"
-#CON="OneD.amp,TwoD.amp,ThreeD.amp"
+F="http://thredds1.nkn.uidaho.edu:8080/thredds/dodsC/NWCSC_INTEGRATED_SCENARIOS_ALL_CLIMATE/macav2livneh/TEST/macav2livneh_nocompress_tasmax_CSIRO-Mk3-6-0_historical_1980_1989_CONUS.nc"
 
 #VAR=SPEED
 

libsrc4/nc4hdf.c

@@ -1413,10 +1413,16 @@ var_create_dataset(NC_GRP_INFO_T *grp, NC_VAR_INFO_T *var, int write_dimid)
       /* If there are no unlimited dims, and no filters, and the user
        * has not specified chunksizes, use contiguous variable for
        * better performance. */
-      if (!unlimdim && !var->shuffle && !var->deflate && !var->options_mask &&
-          !var->fletcher32 && (var->chunksizes == NULL || !var->chunksizes[0]))
-         var->contiguous = NC_TRUE;
 
+      if(!var->shuffle && !var->deflate && !var->options_mask &&
+          !var->fletcher32 && (var->chunksizes == NULL || !var->chunksizes[0])) {
+#ifdef USE_HDF4
+      if(h5->hdf4 || !unlimdim)
+#else 
+      if(!unlimdim)
+#endif
+         var->contiguous = NC_TRUE;
+      }
       if (!(dimsize = malloc(var->ndims * sizeof(hsize_t))))
          BAIL(NC_ENOMEM);
       if (!(maxdimsize = malloc(var->ndims * sizeof(hsize_t))))

libsrc4/nc4var.c

@@ -522,7 +522,12 @@ nc_def_var_nc4(int ncid, const char *name, nc_type xtype,
       }
 
       /* Check for unlimited dimension and turn off contiguous storage */
+      /* (unless HDF4 file) */
+#ifdef USE_HDF4
+      if (dim->unlimited && !h5->hdf4)
+#else
       if (dim->unlimited)
+#endif
 	 var->contiguous = NC_FALSE;
 
       /* Track dimensions for variable */
@@ -802,6 +807,7 @@ nc_def_var_extra(int ncid, int varid, int *shuffle, int *deflate,
    NC_DIM_INFO_T *dim;
    int d;
    int retval;
+   nc_bool_t ishdf4 = NC_FALSE; /* Use this to avoid so many ifdefs
 
    LOG((2, "%s: ncid 0x%x varid %d", __func__, ncid, varid));
 
@@ -809,6 +815,10 @@ nc_def_var_extra(int ncid, int varid, int *shuffle, int *deflate,
    if ((retval = nc4_find_nc_grp_h5(ncid, &nc, &grp, &h5)))
       return retval;
 
+#ifdef USE_HDF4
+   ishdf4 = h5->hdf4;
+#endfi
+
    /* Attempting to do any of these things on a netCDF-3 file produces
     * an error. */
    if (!h5)
@@ -883,6 +893,7 @@ nc_def_var_extra(int ncid, int varid, int *shuffle, int *deflate,
       if (var->deflate || var->fletcher32 || var->shuffle)
 	 return NC_EINVAL;
       
+     if (!ishdf4) {
       for (d = 0; d < var->ndims; d++)
       {
 	 if ((retval = nc4_find_dim(grp, var->dimids[d], &dim, NULL)))
@@ -890,12 +901,12 @@ nc_def_var_extra(int ncid, int varid, int *shuffle, int *deflate,
 	 if (dim->unlimited)
 	    return NC_EINVAL;
       }
-
       var->contiguous = NC_TRUE;
+    }
    }
 
    /* Chunksizes anyone? */
-   if (contiguous && *contiguous == NC_CHUNKED)
+   if (!ishdf4 && contiguous && *contiguous == NC_CHUNKED)
    {
       var->contiguous = NC_FALSE;
 
@@ -1005,11 +1016,12 @@ nc_inq_var_chunking_ints(int ncid, int varid, int *contiguousp, int *chunksizesp
    NC *nc;
    NC_GRP_INFO_T *grp; 
    NC_VAR_INFO_T *var;
+
    size_t *cs = NULL;
    int i, retval;
 
    /* Find this ncid's file info. */
-   if ((retval = nc4_find_nc_grp_h5(ncid, &nc, &grp, NULL)))
+   if ((retval = nc4_find_nc_grp_h5(ncid, &nc, &grp, &h5)))
       return retval;
    assert(nc);
 
@@ -1050,14 +1062,20 @@ nc_def_var_chunking_ints(int ncid, int varid, int contiguous, int *chunksizesp)
    NC *nc;
    NC_GRP_INFO_T *grp; 
    NC_VAR_INFO_T *var;
+   NC_HDF5_FILE_INFO_T *h5;
    size_t *cs = NULL;
    int i, retval;
 
    /* Find this ncid's file info. */
-   if ((retval = nc4_find_nc_grp_h5(ncid, &nc, &grp, NULL)))
+   if ((retval = nc4_find_nc_grp_h5(ncid, &nc, &grp, &h5)))
       return retval;
    assert(nc);
 
+#ifdef USE_HDF4
+   if(h5->hdf4)
+	return NC_NOERR;
+#endif  
+
    /* Find var cause I need the number of dims. */
    if ((retval = nc4_find_g_var_nc(nc, ncid, varid, &grp, &var)))
       return retval;