From 68cffc17aff0f0048ed7a6d28f8c6501e20093e7 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 16 Nov 2018 12:40:17 -0700 Subject: [PATCH 1/6] Added release date. --- RELEASE_NOTES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index cfc1b94ba..a5aba71e8 100644 --- a/RELEASE_NOTES.md +++ b/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). From 128b6491900ad73395cb89deae0741c4506cf00e Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 16 Nov 2018 15:08:17 -0700 Subject: [PATCH 2/6] Fixed a whitespace issue that occurs on OSX. --- dap4_test/baseline/test_atomic_array.syn.d4d | 12 ++++++------ dap4_test/test_data.sh | 10 ++++------ include/ncoffsets.h | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dap4_test/baseline/test_atomic_array.syn.d4d b/dap4_test/baseline/test_atomic_array.syn.d4d index ad8ee3dfe..2b764e901 100644 --- a/dap4_test/baseline/test_atomic_array.syn.d4d +++ b/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 ; } diff --git a/dap4_test/test_data.sh b/dap4_test/test_data.sh index bbfee9121..10ee2ff69 100755 --- a/dap4_test/test_data.sh +++ b/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 +#rm -rf ./results_test_data finish - - diff --git a/include/ncoffsets.h b/include/ncoffsets.h index ccc0f0d5f..36381432b 100644 --- a/include/ncoffsets.h +++ b/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*/ From 9796831e7077272013c6ca418abb7f2222c59394 Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Sun, 18 Nov 2018 09:41:21 -0700 Subject: [PATCH 3/6] change rm in test script to use specific file names so parallel builds continue to work --- ncdump/tst_netcdf4_4.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ncdump/tst_netcdf4_4.sh b/ncdump/tst_netcdf4_4.sh index 44d2c0115..115bc2818 100755 --- a/ncdump/tst_netcdf4_4.sh +++ b/ncdump/tst_netcdf4_4.sh @@ -75,8 +75,7 @@ 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 +rm -f tst_ncf213.cdl tst_ncf213.nc tst_ncf213.tmp ref_tst_ncf213.tmp if test $ok = 0 ; then echo "*** FAIL: NCF-213 Bug Fix test" From 6c9ccd97d835ddc9fe916eeef6b0a5acdccec21a Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Sun, 18 Nov 2018 13:43:49 -0700 Subject: [PATCH 4/6] move cleanup to makefile --- ncdump/Makefile.am | 8 ++++---- ncdump/tst_netcdf4_4.sh | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ncdump/Makefile.am b/ncdump/Makefile.am index 67d670764..9251103d5 100644 --- a/ncdump/Makefile.am +++ b/ncdump/Makefile.am @@ -143,9 +143,9 @@ 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_netcdf4_*.cdl test1_ncdump.cdl test2_ncdump.cdl test1.cdl \ -ctest1.cdl test1_cdf5.cdl test2_cdf5.cdl test1_offset.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 \ c0.nc c0_4.nc small.nc small2.nc c0tmp.nc c1.ncml utf8.cdl \ utf8_64.cdl utf8.nc utf8_64.nc nc4_utf8.cdl nc4_utf8.nc \ @@ -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 diff --git a/ncdump/tst_netcdf4_4.sh b/ncdump/tst_netcdf4_4.sh index 115bc2818..568ac2c61 100755 --- a/ncdump/tst_netcdf4_4.sh +++ b/ncdump/tst_netcdf4_4.sh @@ -74,9 +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 tst_ncf213.tmp ref_tst_ncf213.tmp - if test $ok = 0 ; then echo "*** FAIL: NCF-213 Bug Fix test" exit 1 From fe62f61509703a8376a9cba7f311e2a5e5a2edf1 Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Sun, 18 Nov 2018 14:59:05 -0700 Subject: [PATCH 5/6] fixed makefile typo --- ncdump/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ncdump/Makefile.am b/ncdump/Makefile.am index 9251103d5..0b9e5648b 100644 --- a/ncdump/Makefile.am +++ b/ncdump/Makefile.am @@ -143,9 +143,9 @@ 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 *.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 \ +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 \ c0.nc c0_4.nc small.nc small2.nc c0tmp.nc c1.ncml utf8.cdl \ utf8_64.cdl utf8.nc utf8_64.nc nc4_utf8.cdl nc4_utf8.nc \ From c950874a9c0aca02bb75bd92cf0cdf7a2b31d42c Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Mon, 19 Nov 2018 12:21:06 -0700 Subject: [PATCH 6/6] Corrected a cleanup issue that was left in whilst debugging. --- dap4_test/test_data.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dap4_test/test_data.sh b/dap4_test/test_data.sh index 10ee2ff69..78a040d79 100755 --- a/dap4_test/test_data.sh +++ b/dap4_test/test_data.sh @@ -88,6 +88,6 @@ if test "x${CDLDIFF}" = x1 ; then fi done fi -#rm -rf ./results_test_data +rm -rf ./results_test_data finish