Merge remote-tracking branch 'upstream/master'

RELEASE_NOTES.md

@@ -1,27 +1,25 @@
 \page release_notes Release Notes
 
-This file contains a high-level description of this package's evolution.
-Releases are in reverse chronological order (most recent first). 
+This file contains a high-level description of this package's evolution. Releases are in reverse chronological order (most recent first). 
 
-Recent releases include references to Jira issue identifiers for more
-information, where '[NCF-XXX]' refers to https://www.unidata.ucar.edu/jira/browse/NCF-XXX .
+Recent releases include references to Jira issue identifiers for more information, where '[NCF-XXX]' refers to https://www.unidata.ucar.edu/jira/browse/NCF-XXX .
 
 ## 4.3.1 Released TBD
 
+
+* Addressed an issue reported by Jeff Whitaker regarding `nc_inq_nvars` returning an incorrect number of dimensions (this issue was introduced in 4.3.1-rc5).  Integrated a test contributed by Jeff Whitaker.
+
 ### 4.3.1-rc5 Released 2013-12-06
 
-* When opening a netCDF-4 file, streamline the iteration over objects in
-  the underlying HDF5 file.
+* When opening a netCDF-4 file, streamline the iteration over objects in the underlying HDF5 file.
 
-* Fixed netCDF-4 failure when renaming a dimension and renaming a
-  variable using that dimension, in either order. [NCF-177]
+* Fixed netCDF-4 failure when renaming a dimension and renaming a variable using that dimension, in either order. [NCF-177]
 
 [NCF-177]:https://bugtracking.unidata.ucar.edu/browse/NCF-177
 
 * When compiling with `hdf4` support, both autotools and cmake-based builds now properly look for the `libjpeg` dependency and will link against it when found (or complain if it's not).  Also added `ENABLE_HDF4_FILE_TESTS` option to CMake-based builds.
 
-* Fixed bug in ncgen; it was not properly filling empty string constants
-  ("") to be the proper length. [NCF-279]
+* Fixed bug in ncgen; it was not properly filling empty string constants ("") to be the proper length. [NCF-279]
 
 [NCF-279]:https://bugtracking.unidata.ucar.edu/browse/NCF-279
 
@@ -30,17 +28,11 @@ information, where '[NCF-XXX]' refers to https://www.unidata.ucar.edu/jira/brows
 
 [NCF-278]:https://bugtracking.unidata.ucar.edu/browse/NCF-278
 
-* Fixed bug in handling Http Basic Authorization.
-  The code was actually there but was not being
-  executed. [NCF-277]
+* Fixed bug in handling Http Basic Authorization. The code was actually there but was not being executed. [NCF-277]
 
 [NCF-277]:https://bugtracking.unidata.ucar.edu/browse/NCF-277
 
-* Added hack to the DAP code to address a problem with the
-  Columbia.edu server. That server does not serve up proper
-  DAP2 DDS replies. The Dataset {...} name changes depending
-  on if the request has certain kinds of
-  constraints. [NCF-276]
+* Added hack to the DAP code to address a problem with the Columbia.edu server. That server does not serve up proper DAP2 DDS replies. The Dataset {...} name changes depending on if the request has certain kinds of constraints. [NCF-276]
 
 [NCF-276]:https://bugtracking.unidata.ucar.edu/browse/NCF-276
 

nc_test4/CMakeLists.txt

@@ -2,15 +2,16 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 INCLUDE_DIRECTORIES(".")
 # Some extra tests
-SET(NC4_TESTS tst_dims tst_dims2 tst_dims3 tst_files tst_files4 tst_vars tst_varms tst_unlim_vars tst_converts tst_converts2 tst_grps tst_grps2
-tst_compounds tst_compounds2 tst_compounds3 tst_opaques tst_strings
-tst_strings2 tst_interops tst_interops4 tst_interops6
-tst_enums tst_coords tst_coords2 tst_coords3 tst_vars3 tst_vars4
-tst_chunks tst_chunks2 tst_utf8 tst_fills tst_fills2 tst_fillbug
-tst_xplatform tst_xplatform2 tst_h_atts2 tst_endian_fill tst_atts 
-t_type cdm_sea_soundings tst_vl tst_atts1 tst_atts2
-tst_vars2 tst_files5 tst_files6 tst_sync tst_h_strbug tst_h_refs
-tst_h_scalar)
+SET(NC4_TESTS tst_dims tst_dims2 tst_dims3 tst_files tst_files4 tst_vars 
+  tst_varms tst_unlim_vars tst_converts tst_converts2 tst_grps tst_grps2
+  tst_compounds tst_compounds2 tst_compounds3 tst_opaques tst_strings
+  tst_strings2 tst_interops tst_interops4 tst_interops6
+  tst_enums tst_coords tst_coords2 tst_coords3 tst_vars3 tst_vars4
+  tst_chunks tst_chunks2 tst_utf8 tst_fills tst_fills2 tst_fillbug
+  tst_xplatform tst_xplatform2 tst_h_atts2 tst_endian_fill tst_atts 
+  t_type cdm_sea_soundings tst_vl tst_atts1 tst_atts2
+  tst_vars2 tst_files5 tst_files6 tst_sync tst_h_strbug tst_h_refs
+  tst_h_scalar tst_nvars)
 
 # Note, renamegroup needs to be compiled before run_grp_rename
 build_bin_test(renamegroup)
@@ -71,6 +72,6 @@ ENDIF()
 ## Specify files to be distributed by 'make dist'
 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
 SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} ref_chunks1.cdl ref_chunks2.cdl ref_tst_compounds.nc ref_tst_xplatform2_1.nc ref_tst_xplatform2_2.nc ref_tst_dims.nc ref_tst_interops4.nc ref_grp_rename.cdl)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} ref_chunks1.cdl ref_chunks2.cdl ref_tst_compounds.nc ref_tst_xplatform2_1.nc ref_tst_xplatform2_2.nc ref_tst_dims.nc ref_tst_interops4.nc ref_grp_rename.cdl ref_tst_nvars.nc)
 
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")

nc_test4/Makefile.am

@@ -21,7 +21,7 @@ tst_chunks tst_chunks2 tst_utf8 tst_fills tst_fills2 tst_fillbug	\
 tst_xplatform tst_xplatform2 tst_h_atts2 tst_endian_fill tst_atts	\
 t_type cdm_sea_soundings tst_camrun tst_vl tst_atts1 tst_atts2		\
 tst_vars2 tst_files5 tst_files6 tst_sync tst_h_strbug tst_h_refs        \
-tst_h_scalar
+tst_h_scalar tst_nvars
 
 check_PROGRAMS = $(NC4_TESTS) renamegroup
 
@@ -120,7 +120,7 @@ run_get_hdf4_files.sh run_valgrind_tests.sh run_valgrind_tests2.sh	\
 run_bm_ar4.sh ref_tst_compounds.nc run_hdf4_valgrind_tests.sh		\
 ref_tst_xplatform2_1.nc ref_tst_xplatform2_2.nc ref_tst_dims.nc		\
 ref_tst_interops4.nc run_get_knmi_files.sh CMakeLists.txt               \
-run_grp_rename.sh
+run_grp_rename.sh ref_tst_nvars.nc
 
 CLEANFILES = tst_mpi_parallel.bin cdm_sea_soundings.nc bm_chunking.nc	\
 bm_radar.nc bm_radar1.nc radar_3d_compression_test.txt			\

nc_test4/tst_nvars.c

@@ -0,0 +1,43 @@
+/* This test was contributed by Jeff Whitaker to illustrate
+   a bug introduced in netcdf-c 4.3.1-rc5.
+
+   nc_inq_nvars should return 1.
+
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <netcdf.h>
+#define FILE_NAME "ref_tst_nvars.nc"
+#define GRP_NAME "phony_group"
+
+void
+check_err(const int stat, const int line, const char *file) {
+    if (stat != NC_NOERR) {
+        (void)fprintf(stderr,"line %d of %s: %s\n", line, file, nc_strerror(stat));
+        fflush(stderr);
+        exit(1);
+    }
+}
+
+int
+main()
+{
+
+   int ncid, varid, grpid, numvars, retval;
+
+   if ((retval = nc_open(FILE_NAME, NC_NOWRITE, &ncid)))
+   check_err(retval,__LINE__,__FILE__);
+
+   if ((retval = nc_inq_grp_ncid(ncid, GRP_NAME, &grpid)))
+   check_err(retval,__LINE__,__FILE__);
+
+   if ((retval = nc_inq_nvars(grpid, &numvars)))
+   check_err(retval,__LINE__,__FILE__);
+
+   (void)fprintf(stdout,"number of vars %d\n", numvars);
+
+
+   return (numvars != 1);
+}