Merge pull request #1212 from Unidata/v4.6.2-release-branch.wif

V4.6.2 release branch

RELEASE_NOTES.md

@@ -2,10 +2,10 @@ Release Notes       {#RELEASE_NOTES}
 =============
 
 \brief Release notes file for the netcdf-c package.
- 
+
 This file contains a high-level description of this package's evolution. Releases are in reverse chronological order (most recent first). Note that, as of netcdf 4.2, the `netcdf-c++` and `netcdf-fortran` libraries have been separated into their own libraries.
 
-## 4.6.2 - TBD
+## 4.6.2 - November 16, 2018
 
 * [Enhancement] Lazy att read - only read atts when user requests one of them.  See [GitHub #857](https://github.com/Unidata/netcdf-c/issues/857).
 * [Enhancement] Fast global att read - when global atts are read, they are read much more quickly.  See [GitHub #857](https://github.com/Unidata/netcdf-c/issues/857).

dap4_test/baseline/test_atomic_array.syn.d4d

@@ -1,8 +1,8 @@
 netcdf test_atomic_array.syn {
 types:
-  byte enum cloud_class_t {Clear = 0, Cumulonimbus = 1, Stratus = 2, 
-      Stratocumulus = 3, Cumulus = 4, Altostratus = 5, Nimbostratus = 6, 
-      Altocumulus = 7, Cirrostratus = 8, Cirrocumulus = 9, Cirrus = 10, 
+  byte enum cloud_class_t {Clear = 0, Cumulonimbus = 1, Stratus = 2,
+      Stratocumulus = 3, Cumulus = 4, Altostratus = 5, Nimbostratus = 6,
+      Altocumulus = 7, Cirrostratus = 8, Cirrocumulus = 9, Cirrus = 10,
       Missing = 127} ;
   opaque(16) opaque16_t ;
 dimensions:
@@ -45,9 +45,9 @@ data:
   "4a/q%n9;5Y", "{fIl?T\"\\A[" ;
 
  vo =
-  
-    0XA2177AA7287C04FA8BB57BCDF76EC80F, 0X34FA472AA9404DD543143CADED303A75 ;
 
- primary_cloud = Stratus, Cirrocumulus, Nimbostratus, Cirrostratus, 
+  0XA2177AA7287C04FA8BB57BCDF76EC80F, 0X34FA472AA9404DD543143CADED303A75 ;
+
+ primary_cloud = Stratus, Cirrocumulus, Nimbostratus, Cirrostratus,
     Stratocumulus ;
 }

dap4_test/test_data.sh

@@ -25,7 +25,7 @@ for f in $F ; do
 	    failure "diff -wBb ${BASELINE}/${f}.d4d ./results_test_data/${f}.d4d"
 	fi
     elif test "x${RESET}" = x1 ; then
-	echo "${f}:" 
+	echo "${f}:"
 	cp ./results_test_data/${f}.d4d ${BASELINE}/${f}.d4d
     fi
 done
@@ -82,14 +82,12 @@ if test "x${CDLDIFF}" = x1 ; then
     trim ${CDLTESTFILES}/${STEM}.cdl ./b1
     trim ./results_test_data/${f}.d4d ./r1
     baseclean b1 b2
-    resultclean r1 r2  
+    resultclean r1 r2
     if ! diff -wBb ./b2 ./r2 ; then
-	failure "${f}" 
+	failure "${f}"
     fi
   done
 fi
 rm -rf ./results_test_data
 
 finish
-
-

include/ncoffsets.h

@@ -53,6 +53,6 @@ typedef struct NCtypealignset {
 
 size_t NC_class_alignment(int ncclass);
 void NC_compute_alignments(void);
-int NC_alignments_computed;
+EXTERNL int NC_alignments_computed;
 
 #endif /*NCOFFSETS_H*/

ncdump/Makefile.am

@@ -143,7 +143,7 @@ EXTRA_DIST += L512.bin
 SUBDIRS = cdl expected
 
 CLEANFILES = tst_*.nc tmp*.nc test*.nc iter.* tmp*.cdl			\
-tst_output_*.cdl tst_output_*.c tst_utf8_*.cdl tst_tst8.cdl		\
+tst_output_*.cdl tst_output_*.c tst_utf8_*.cdl *.tmp tst_tst8.cdl	\
 tst_netcdf4_*.cdl test1_ncdump.cdl test2_ncdump.cdl test1.cdl		\
 ctest1.cdl test1_cdf5.cdl test2_cdf5.cdl test1_offset.cdl		\
 test2_offset.cdl ctest0.nc ctest0_64.nc c1.cdl c1_4.cdl ctest1_64.cdl	\
@@ -163,4 +163,4 @@ compound_datasize_test.nc compound_datasize_test2.nc ncf199.nc		\
 tst_c0.cdl tst_c0_4.cdl tst_c0_4c.cdl tst_c0_64.cdl			\
 tst_compound_datasize_test.cdl tst_compound_datasize_test2.cdl		\
 tst_ncf199.cdl tst_tst_gattenum.cdl tst_tst_usuffix.cdl ctest.c		\
-ctest64.c nccopy3_subset_out.nc camrun.c
+ctest64.c nccopy3_subset_out.nc camrun.c tst_ncf213.cdl tst_ncf213.nc

ncdump/tst_netcdf4_4.sh

@@ -74,10 +74,6 @@ cleanncprops ${srcdir}/ref_tst_ncf213.cdl ref_tst_ncf213.tmp
 ok=1;
 if diff -b tst_ncf213.tmp ref_tst_ncf213.tmp ; then ok=1; else ok=0; fi
 
-# cleanup
-#rm -f tst_ncf213.cdl tst_ncf213.nc
-rm -f *.tmp
-
 if test $ok = 0 ; then
   echo "*** FAIL: NCF-213 Bug Fix test"
   exit 1