merged 731 again

Author: edhartnett

CMakeLists.txt

@@ -1303,6 +1303,11 @@ IF(SIZEOF_UINT)
   SET(HAVE_UINT TRUE)
 ENDIF(SIZEOF_UINT)
 
+CHECK_TYPE_SIZE("schar"      SIZEOF_SCHAR)
+IF(SIZEOF_SCHAR)
+  SET(HAVE_SCHAR TRUE)
+ENDIF(SIZEOF_SCHAR)
+
 CHECK_TYPE_SIZE("long"      SIZEOF_LONG)
 CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG)
 IF(SIZEOF_LONG_LONG)

include/nc3dispatch.h

@@ -158,14 +158,17 @@ NC3_def_var(int ncid, const char *name,
 
 extern int
 NC3_inq_var(int ncid, int varid, char *name,
-	 nc_type *xtypep, int *ndimsp, int *dimidsp, int *nattsp);
+	 nc_type *xtypep, int *ndimsp, int *dimidsp, int *nattsp,
+	 int *no_fill, void *fill_valuep);
 
 extern int
 NC3_inq_varid(int ncid, const char *name, int *varidp);
 
 extern int
 NC3_rename_var(int ncid, int varid, const char *name);
 
+extern int
+NC3_def_var_fill(int,int,int,const void*);
 
 extern int
 NC3_put_vara(int ncid, int varid,

include/nc3internal.h

@@ -186,6 +186,7 @@ typedef struct NC_var {
 	nc_type type;		/* the discriminant */
 	size_t len;		/* the total length originally allocated */
 	off_t begin;
+	int no_fill;		/* whether fill mode is ON or OFF */
 } NC_var;
 
 typedef struct NC_vararray {

include/ncdispatch.h

@@ -9,7 +9,9 @@
 #ifndef _DISPATCH_H
 #define _DISPATCH_H
 
+#if HAVE_CONFIG_H
 #include "config.h"
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -250,6 +252,7 @@ int (*inq_var_all)(int ncid, int varid, char *name, nc_type *xtypep,
               );
 
 int (*var_par_access)(int, int, int);
+int (*def_var_fill)(int, int, int, const void*);
 
 /* Note the following may still be invoked by netcdf client code
    even when the file is a classic file; they will just return an error or
@@ -289,7 +292,6 @@ int (*def_opaque)(int, size_t, const char*, nc_type*);
 int (*def_var_deflate)(int, int, int, int, int);
 int (*def_var_fletcher32)(int, int, int);
 int (*def_var_chunking)(int, int, int, const size_t*);
-int (*def_var_fill)(int, int, int, const void*);
 int (*def_var_endian)(int, int, int);
 int (*def_var_filter)(int, int, unsigned int, size_t, const unsigned int*);
 int (*set_var_chunk_cache)(int, int, size_t, size_t, float);

libdap2/ncd2dispatch.c

@@ -137,6 +137,7 @@ NCDEFAULT_put_varm,
 NCD2_inq_var_all,
 
 NCD2_var_par_access,
+NCD2_def_var_fill,
 
 #ifdef USE_NETCDF4
 NCD2_show_metadata,
@@ -172,7 +173,6 @@ NCD2_def_opaque,
 NCD2_def_var_deflate,
 NCD2_def_var_fletcher32,
 NCD2_def_var_chunking,
-NCD2_def_var_fill,
 NCD2_def_var_endian,
 NCD2_def_var_filter,
 NCD2_set_var_chunk_cache,
@@ -2434,6 +2434,15 @@ NCD2_var_par_access(int ncid, int p2, int p3)
     return THROW(NC_ENOPAR);
 }
 
+int
+NCD2_def_var_fill(int ncid, int p2, int p3, const void* p4)
+{
+    NC* drno;
+    int ret;
+    if((ret = NC_check_id(ncid, (NC**)&drno)) != NC_NOERR) return THROW(ret);
+    ret = nc_def_var_fill(getnc3id(drno), p2, p3, p4);
+    return THROW(ret);
+}
 
 #ifdef USE_NETCDF4
 
@@ -2763,16 +2772,6 @@ NCD2_def_var_chunking(int ncid, int p2, int p3, const size_t* p4)
     return THROW(ret);
 }
 
-int
-NCD2_def_var_fill(int ncid, int p2, int p3, const void* p4)
-{
-    NC* drno;
-    int ret;
-    if((ret = NC_check_id(ncid, (NC**)&drno)) != NC_NOERR) return THROW(ret);
-    ret = nc_def_var_fill(getnc3id(drno), p2, p3, p4);
-    return THROW(ret);
-}
-
 int
 NCD2_def_var_endian(int ncid, int p2, int p3)
 {

libdap2/ncd2dispatch.h

@@ -158,6 +158,9 @@ NCD2_rename_var(int ncid, int varid, const char *name);
 extern int
 NCD2_var_par_access(int, int, int);
 
+extern int
+NCD2_def_var_fill(int, int, int, const void *);
+
   /* netCDF4 API only */
 #ifdef USE_NETCDF4
   extern int
@@ -241,9 +244,6 @@ NCD2_var_par_access(int, int, int);
   extern int
   NCD2_def_var_chunking(int, int, int, const size_t *);
 
-  extern int
-  NCD2_def_var_fill(int, int, int, const void *);
-
   extern int
   NCD2_def_var_endian(int, int, int);
 

libdap4/ncd4dispatch.c

@@ -853,6 +853,7 @@ NCDEFAULT_put_varm,
 NCD4_inq_var_all,
 
 NCD4_var_par_access,
+NCD4_def_var_fill,
 
 #ifdef USE_NETCDF4
 NCD4_show_metadata,
@@ -888,7 +889,6 @@ NCD4_def_opaque,
 NCD4_def_var_deflate,
 NCD4_def_var_fletcher32,
 NCD4_def_var_chunking,
-NCD4_def_var_fill,
 NCD4_def_var_endian,
 NCD4_def_var_filter,
 NCD4_set_var_chunk_cache,

libdispatch/dvar.c

@@ -538,6 +538,87 @@ NC_getshape(int ncid, int varid, int ndims, size_t* shape)
    return status;
 }
 
+/*! Set the fill value for a variable.
+
+\ingroup variables
+
+\param ncid NetCDF ID, from a previous call to nc_open or
+nc_create.
+
+\param varid Variable ID.
+
+\param no_fill Set to NC_NOFILL to turn off fill mode for this
+variable. Set to NC_FILL (the default) to turn on fill mode for the
+variable.
+
+\param fill_value the fill value to be used for this variable. Must be
+the same type as the variable. This must point to enough free memory
+to hold one element of the data type of the variable. (For example, an
+NC_INT will require 4 bytes for it's fill value, which is also an
+NC_INT.)
+
+ * @returns ::NC_NOERR No error.
+ * @returns ::NC_EBADID Bad ID.
+ * @returns ::NC_ENOTINDEFINE Not in define mode.  This is returned for
+netCDF classic, 64-bit offset, or 64-bit data files, or for netCDF-4 files,
+when they were created with NC_STRICT_NC3 flag. See \ref nc_create.
+ * @returns ::NC_EPERM Attempt to create object in read-only file.
+
+\section nc_def_var_fill_example Example
+
+In this example from libsrc4/tst_vars.c, a variable is defined, and
+the fill mode turned off. Then nc_inq_fill() is used to check that the
+setting is correct. Then some data are written to the variable. Since
+the data that are written do not cover the full extent of the
+variable, the missing values will just be random. If fill value mode
+was turned on, the missing values would get the fill value.
+
+\code
+#define DIM7_LEN 2
+#define DIM7_NAME "dim_7_from_Indiana"
+#define VAR7_NAME "var_7_from_Idaho"
+#define NDIMS 1
+      int dimids[NDIMS];
+      size_t index[NDIMS];
+      int varid;
+      int no_fill;
+      unsigned short ushort_data = 42, ushort_data_in, fill_value_in;
+
+      if (nc_create(FILE_NAME, NC_NETCDF4, &ncid)) ERR;
+      if (nc_def_dim(ncid, DIM7_NAME, DIM7_LEN, &dimids[0])) ERR;
+      if (nc_def_var(ncid, VAR7_NAME, NC_USHORT, NDIMS, dimids,
+		     &varid)) ERR;
+      if (nc_def_var_fill(ncid, varid, 1, NULL)) ERR;
+
+      if (nc_inq_var_fill(ncid, varid, &no_fill, &fill_value_in)) ERR;
+      if (!no_fill) ERR;
+
+      index[0] = 1;
+      if (nc_put_var1_ushort(ncid, varid, index, &ushort_data)) ERR;
+
+      index[0] = 0;
+      if (nc_get_var1_ushort(ncid, varid, index, &ushort_data_in)) ERR;
+
+      if (nc_close(ncid)) ERR;
+\endcode
+*/
+int
+nc_def_var_fill(int ncid, int varid, int no_fill, const void *fill_value)
+{
+    NC* ncp;
+    int stat = NC_check_id(ncid,&ncp);
+    if(stat != NC_NOERR) return stat;
+
+    /* Dennis Heimbigner: (Using NC_GLOBAL is ilegal, as this API) has no
+     * provision for specifying the type of the fillvalue, it must of necessity
+     * be using the type of the variable to interpret the bytes of the
+     * fill_value argument.
+     */
+    if (varid == NC_GLOBAL) return NC_EGLOBAL;
+
+    return ncp->dispatch->def_var_fill(ncid,varid,no_fill,fill_value);
+}
+
 #ifdef USE_NETCDF4
 /** \ingroup variables
 
@@ -899,80 +980,6 @@ nc_def_var_chunking(int ncid, int varid, int storage,
 					   chunksizesp);
 }
 
-/*! Set the fill value for a netCDF4/HDF5 variable.
-
-\ingroup variables
-
-\param ncid NetCDF ID, from a previous call to nc_open or
-nc_create.
-
-\param varid Variable ID.
-
-\param no_fill Set to NC_NOFILL to turn off fill mode for this
-variable. Set to NC_FILL (the default) to turn on fill mode for the
-variable.
-
-\param fill_value the fill value to be used for this variable. Must be
-the same type as the variable. This must point to enough free memory
-to hold one element of the data type of the variable. (For example, an
-NC_INT will require 4 bytes for it's fill value, which is also an
-NC_INT.)
-
- * @returns ::NC_NOERR No error.
- * @returns ::NC_EBADID Bad ID.
- * @returns ::NC_ENOTNC4 Not a netCDF-4 file.
- * @returns ::NC_ENOTINDEFINE Not in define mode.  This is returned for
-netCDF classic or 64-bit offset files, or for netCDF-4 files, when
-they wwere created with NC_STRICT_NC3 flag. See \ref nc_create.
- * @returns ::NC_EPERM Attempt to create object in read-only file.
-
-\section nc_def_var_fill_example Example
-
-In this example from libsrc4/tst_vars.c, a variable is defined, and
-the fill mode turned off. Then nc_inq_fill() is used to check that the
-setting is correct. Then some data are written to the variable. Since
-the data that are written do not cover the full extent of the
-variable, the missing values will just be random. If fill value mode
-was turned on, the missing values would get the fill value.
-
-\code
-#define DIM7_LEN 2
-#define DIM7_NAME "dim_7_from_Indiana"
-#define VAR7_NAME "var_7_from_Idaho"
-#define NDIMS 1
-      int dimids[NDIMS];
-      size_t index[NDIMS];
-      int varid;
-      int no_fill;
-      unsigned short ushort_data = 42, ushort_data_in, fill_value_in;
-
-      if (nc_create(FILE_NAME, NC_NETCDF4, &ncid)) ERR;
-      if (nc_def_dim(ncid, DIM7_NAME, DIM7_LEN, &dimids[0])) ERR;
-      if (nc_def_var(ncid, VAR7_NAME, NC_USHORT, NDIMS, dimids,
-		     &varid)) ERR;
-      if (nc_def_var_fill(ncid, varid, 1, NULL)) ERR;
-
-      if (nc_inq_var_fill(ncid, varid, &no_fill, &fill_value_in)) ERR;
-      if (!no_fill) ERR;
-
-      index[0] = 1;
-      if (nc_put_var1_ushort(ncid, varid, index, &ushort_data)) ERR;
-
-      index[0] = 0;
-      if (nc_get_var1_ushort(ncid, varid, index, &ushort_data_in)) ERR;
-
-      if (nc_close(ncid)) ERR;
-\endcode
-*/
-int
-nc_def_var_fill(int ncid, int varid, int no_fill, const void *fill_value)
-{
-    NC* ncp;
-    int stat = NC_check_id(ncid,&ncp);
-    if(stat != NC_NOERR) return stat;
-    return ncp->dispatch->def_var_fill(ncid,varid,no_fill,fill_value);
-}
-
 /**
 @ingroup variables
 

libsrc/attr.m4

@@ -836,6 +836,18 @@ NC3_put_att(
     if(nelems != 0 && value == NULL)
 	return NC_EINVAL; /* Null arg */
 
+    if (varid != NC_GLOBAL && !strcmp(name, _FillValue)) {
+        /* Fill value must be of the same data type */
+        if (type != ncp->vars.value[varid]->type) return NC_EBADTYPE;
+ 
+        /* Fill value must have exactly one value */
+        if (nelems != 1) return NC_EINVAL;
+
+        /* Only allow for variables defined in initial define mode */
+        if (ncp->old != NULL && varid < ncp->old->vars.nelems)
+            return NC_ELATEFILL; /* try put attribute for an old variable */
+    }
+
     attrpp = NC_findattr(ncap, name);
 
     /* 4 cases: exists X indef */

libsrc/nc3dispatch.c

@@ -73,7 +73,6 @@ static int NC3_def_opaque(int,size_t,const char*,nc_type*);
 static int NC3_def_var_deflate(int,int,int,int,int);
 static int NC3_def_var_fletcher32(int,int,int);
 static int NC3_def_var_chunking(int,int,int,const size_t*);
-static int NC3_def_var_fill(int,int,int,const void*);
 static int NC3_def_var_endian(int,int,int);
 static int NC3_def_var_filter(int, int, unsigned int, size_t, const unsigned int*);
 
@@ -129,6 +128,7 @@ NCDEFAULT_put_varm,
 NC3_inq_var_all,
 
 NC3_var_par_access,
+NC3_def_var_fill,
 
 #ifdef USE_NETCDF4
 NC3_show_metadata,
@@ -164,7 +164,6 @@ NC3_def_opaque,
 NC3_def_var_deflate,
 NC3_def_var_fletcher32,
 NC3_def_var_chunking,
-NC3_def_var_fill,
 NC3_def_var_endian,
 NC3_def_var_filter,
 NC3_set_var_chunk_cache,
@@ -198,13 +197,12 @@ NC3_inq_var_all(int ncid, int varid, char *name, nc_type *xtypep,
 	       unsigned int* idp, size_t* nparamsp, unsigned int* params
 	       )
 {
-    int stat = NC3_inq_var(ncid,varid,name,xtypep,ndimsp,dimidsp,nattsp);
+    int stat = NC3_inq_var(ncid,varid,name,xtypep,ndimsp,dimidsp,nattsp,no_fill,fill_valuep);
     if(stat) return stat;
     if(shufflep) *shufflep = 0;
     if(deflatep) *deflatep = 0;
     if(fletcher32p) *fletcher32p = 0;
     if(contiguousp) *contiguousp = NC_CONTIGUOUS;
-    if(no_fill) *no_fill = 1;
     if(endiannessp) return NC_ENOTNC4;
     if(idp) return NC_ENOTNC4;
     if(nparamsp) return NC_ENOTNC4;
@@ -506,12 +504,6 @@ NC3_def_var_chunking(int ncid, int varid, int contiguous, const size_t *chunksiz
     return NC_ENOTNC4;
 }
 
-static int
-NC3_def_var_fill(int ncid, int varid, int no_fill, const void *fill_value)
-{
-    return NC_ENOTNC4;
-}
-
 static int
 NC3_def_var_endian(int ncid, int varid, int endianness)
 {