From 547a259c6c3db0e709e20b7b491524e72e9ca2dd Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Mon, 23 Dec 2024 12:53:12 -0700 Subject: [PATCH] final1 --- .github/workflows/main-cmake.yml | 2 +- .github/workflows/run_tests_osx.yml | 2 +- .github/workflows/run_tests_ubuntu.yml | 2 +- .github/workflows/run_tests_win_cygwin.yml | 2 +- .github/workflows/run_tests_win_mingw.yml | 2 +- Makefile.am | 2 +- configure.ac | 14 +- ncdap_test/Makefile.am | 2 +- nczarr_test/Makefile.am | 8 +- nczarr_test/run_cachetest.sh | 2 +- nczarr_test/run_chunkcases.sh | 2 +- nczarr_test/run_corrupt.sh | 2 +- nczarr_test/run_external.sh | 2 +- nczarr_test/run_fillonlyz.sh | 2 +- nczarr_test/run_filter.sh | 2 +- nczarr_test/run_filter_misc.sh | 2 +- nczarr_test/run_filter_vlen.sh | 2 +- nczarr_test/run_filterinstall.sh | 2 +- nczarr_test/run_interop.sh | 2 +- nczarr_test/run_it_chunks1.sh | 2 +- nczarr_test/run_jsonconvention.sh | 2 +- nczarr_test/run_misc.sh | 2 +- nczarr_test/run_mud.sh | 2 +- nczarr_test/run_nan.sh | 3 +- nczarr_test/run_nccopy5.sh | 2 +- nczarr_test/run_ncgen4.sh | 2 +- nczarr_test/run_nczarr_fill.sh | 2 +- nczarr_test/run_nczfilter.sh | 2 +- nczarr_test/run_newformat.sh | 2 +- nczarr_test/run_notzarr.sh | 2 +- nczarr_test/run_nulls.sh | 2 +- nczarr_test/run_perf_chunks1.sh | 2 +- nczarr_test/run_purezarr.sh | 2 +- nczarr_test/run_quantize.sh | 2 +- nczarr_test/run_scalar.sh | 2 +- nczarr_test/run_specific_filters.sh | 2 +- nczarr_test/run_strings.sh | 2 +- nczarr_test/run_unknown.sh | 2 +- nczarr_test/run_unlim_io.sh | 2 +- nczarr_test/run_ut_map.sh | 2 +- nczarr_test/run_ut_mapapi.sh | 2 +- nczarr_test/run_ut_misc.sh | 2 +- v3.tgz | Bin 9627 -> 0 bytes v3_build.sh | 21 -- v3_nczarr_test/Makefile.am | 40 +++- v3_nczarr_test/run_mud.sh | 2 +- v3_nczarr_test/run_nan.sh | 2 +- v3_nczarr_test/v3manifest.am | 14 ++ v3_nczarr_test/v3only/ref_any.cdl | 57 ++++++ v3_nczarr_test/v3only/ref_bzip2.cdl | 84 ++++++++ v3_nczarr_test/v3only/ref_filtered.cdl | 89 +++++++++ v3_nczarr_test/v3only/ref_groups_regular.cdl | 47 +++++ v3_nczarr_test/v3only/ref_jsonconvention.cdl | 21 ++ v3_nczarr_test/v3only/ref_jsonconvention.zmap | 3 + v3_nczarr_test/v3only/ref_misc2.cdl | 13 ++ v3_nczarr_test/v3only/ref_multi.cdl | 17 ++ v3_nczarr_test/v3only/ref_nczarr2zarr.cdl | 19 ++ v3_nczarr_test/v3only/ref_nulls_zarr.baseline | 13 ++ v3_nczarr_test/v3only/ref_purezarr.cdl | 13 ++ .../v3only/ref_string_nczarr.baseline | 24 +++ .../v3only/ref_string_zarr.baseline | 24 +++ v3_nczarr_test/v3only/ref_tst_mud4-bc.cdl | 189 ++++++++++++++++++ v3_nczarr_test/v3only/ref_tst_mud4.cdl | 127 ++++++++++++ v3_nczarr_test/v3only/ref_tst_mud4_chars.cdl | 127 ++++++++++++ v3_nczarr_test/v3only/ref_tst_nans.cdl | 16 ++ v3_nczarr_test/v3only/ref_xarray.cdl | 13 ++ .../v3only/ref_zarr_test_data_2d.cdl.gz | Bin 0 -> 379 bytes v3_nczarr_test/v3only/run_mud.sh | 84 ++++++++ v3_nczarr_test/v3only/run_nan.sh | 60 ++++++ 69 files changed, 1144 insertions(+), 78 deletions(-) delete mode 100644 v3.tgz delete mode 100644 v3_build.sh create mode 100644 v3_nczarr_test/v3manifest.am create mode 100644 v3_nczarr_test/v3only/ref_any.cdl create mode 100644 v3_nczarr_test/v3only/ref_bzip2.cdl create mode 100644 v3_nczarr_test/v3only/ref_filtered.cdl create mode 100644 v3_nczarr_test/v3only/ref_groups_regular.cdl create mode 100644 v3_nczarr_test/v3only/ref_jsonconvention.cdl create mode 100644 v3_nczarr_test/v3only/ref_jsonconvention.zmap create mode 100644 v3_nczarr_test/v3only/ref_misc2.cdl create mode 100644 v3_nczarr_test/v3only/ref_multi.cdl create mode 100644 v3_nczarr_test/v3only/ref_nczarr2zarr.cdl create mode 100644 v3_nczarr_test/v3only/ref_nulls_zarr.baseline create mode 100644 v3_nczarr_test/v3only/ref_purezarr.cdl create mode 100644 v3_nczarr_test/v3only/ref_string_nczarr.baseline create mode 100644 v3_nczarr_test/v3only/ref_string_zarr.baseline create mode 100644 v3_nczarr_test/v3only/ref_tst_mud4-bc.cdl create mode 100644 v3_nczarr_test/v3only/ref_tst_mud4.cdl create mode 100644 v3_nczarr_test/v3only/ref_tst_mud4_chars.cdl create mode 100644 v3_nczarr_test/v3only/ref_tst_nans.cdl create mode 100644 v3_nczarr_test/v3only/ref_xarray.cdl create mode 100644 v3_nczarr_test/v3only/ref_zarr_test_data_2d.cdl.gz create mode 100644 v3_nczarr_test/v3only/run_mud.sh create mode 100644 v3_nczarr_test/v3only/run_nan.sh diff --git a/.github/workflows/main-cmake.yml b/.github/workflows/main-cmake.yml index fc46a09b59..de2a5e951d 100644 --- a/.github/workflows/main-cmake.yml +++ b/.github/workflows/main-cmake.yml @@ -1,6 +1,6 @@ name: NetCDF-C CMake CI - Windows -on: [ pull_request, workflow_dispatch] +on: [push, pull_request, workflow_dispatch] env: REMOTETESTDOWN: no diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml index bcf0e7c6e4..ccf359ec3a 100644 --- a/.github/workflows/run_tests_osx.yml +++ b/.github/workflows/run_tests_osx.yml @@ -6,7 +6,7 @@ name: Run macOS-based netCDF Tests -on: [pull_request,workflow_dispatch] +on: [push,pull_request,workflow_dispatch] concurrency: group: ${{ github.workflow}}-${{ github.head_ref }} diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml index 324e83ecad..729706db43 100644 --- a/.github/workflows/run_tests_ubuntu.yml +++ b/.github/workflows/run_tests_ubuntu.yml @@ -4,7 +4,7 @@ name: Run Ubuntu/Linux netCDF Tests -on: [pull_request,workflow_dispatch] +on: [push,pull_request,workflow_dispatch] env: REMOTETESTDOWN: no diff --git a/.github/workflows/run_tests_win_cygwin.yml b/.github/workflows/run_tests_win_cygwin.yml index 488ba1d533..bd1accfc8d 100644 --- a/.github/workflows/run_tests_win_cygwin.yml +++ b/.github/workflows/run_tests_win_cygwin.yml @@ -1,6 +1,6 @@ name: Run Cygwin-based tests -on: [pull_request,workflow_dispatch] +on: [push,pull_request,workflow_dispatch] concurrency: group: ${{ github.workflow}}-${{ github.head_ref }} diff --git a/.github/workflows/run_tests_win_mingw.yml b/.github/workflows/run_tests_win_mingw.yml index 0bbeda7fd7..c4b7267324 100644 --- a/.github/workflows/run_tests_win_mingw.yml +++ b/.github/workflows/run_tests_win_mingw.yml @@ -10,7 +10,7 @@ env: CPPFLAGS: "-D_BSD_SOURCE" REMOTETESTDOWN: ${{ vars.REMOTETESTDOWN }} -on: [pull_request,workflow_dispatch] +on: [push,pull_request,workflow_dispatch] concurrency: group: ${{ github.workflow}}-${{ github.head_ref }} diff --git a/Makefile.am b/Makefile.am index 85c83643e4..f99ea6c58f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,7 @@ cmake CMakeLists.txt COMPILE.cmake.txt config.h.cmake.in \ cmake_uninstall.cmake.in FixBundle.cmake.in nc-config.cmake.in \ RELEASE_NOTES.md CTestConfig.cmake.in CTestCustom.cmake.in \ libnetcdf.settings.in netCDFConfig.cmake.in CMakeInstallation.cmake \ -test-driver-verbose test_common.in fuzz CITATION.cff v3.tgz +test-driver-verbose test_common.in fuzz CITATION.cff pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = netcdf.pc diff --git a/configure.ac b/configure.ac index 152a072777..6ff852c1e4 100644 --- a/configure.ac +++ b/configure.ac @@ -2362,9 +2362,6 @@ AM_CONDITIONAL([AX_ENABLE], [test xyes = xyes]) # Provide conditional to identify tests that must be run manually AM_CONDITIONAL([AX_MANUAL], [test xno = xyes]) -# Initialize v3_nczarr_test -cd v3_nczarr_test; rm -fr *; tar -xzf ../v3.tgz - AC_MSG_NOTICE([generating header files and makefiles]) AC_CONFIG_FILES(test_common.sh:test_common.in) AC_CONFIG_FILES(s3cleanup.sh:s3cleanup.in, [chmod ugo+x s3cleanup.sh]) @@ -2439,4 +2436,15 @@ AC_CONFIG_FILES([Makefile ]) AC_OUTPUT() +# Initialize v3_nczarr_test +AC_MSG_CHECKING([@@@ Initializing v3_nczarr_test]) +set -x +mkdir -p v3_nczarr_test +cd v3_nczarr_test +find . -maxdepth 0 -type f -not \( -name CMakeLists.txt -or -name '*.am' -or -name Makefile.in \) -delete +cp v3only/* . +cd .. +set +x +AC_MSG_RESULT([done]) + cat libnetcdf.settings diff --git a/ncdap_test/Makefile.am b/ncdap_test/Makefile.am index 5c1949fb1e..3162280f40 100644 --- a/ncdap_test/Makefile.am +++ b/ncdap_test/Makefile.am @@ -57,7 +57,7 @@ TESTS += tst_remote3.sh testurl.sh # iridl.ldeo.columbia.edu TESTS += tst_encode.sh # test.opendap.org -TESTS += tst_hyrax.sh +#TESTS += tst_hyrax.sh # currently down # Various TESTS += tst_longremote3.sh tst_longremote3.log: tst_remote3.log diff --git a/nczarr_test/Makefile.am b/nczarr_test/Makefile.am index 5a1c4362b5..b26db09ab3 100644 --- a/nczarr_test/Makefile.am +++ b/nczarr_test/Makefile.am @@ -7,10 +7,10 @@ include $(top_srcdir)/lib_flags.am AM_TESTS_ENVIRONMENT += export NCZARRFORMAT=2; TESTS_ENVIRONMENT = TEST_EXTENSIONS = .sh -SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose -sh_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose -LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose -TESTS_ENVIRONMENT += export SETX=1; +#SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose +#sh_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose +#LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver-verbose +#TESTS_ENVIRONMENT += export SETX=1; AM_CFLAGS += -I${top_srcdir} AM_CPPFLAGS += -I${top_srcdir} diff --git a/nczarr_test/run_cachetest.sh b/nczarr_test/run_cachetest.sh index 6a554e19dd..ce181bee2a 100755 --- a/nczarr_test/run_cachetest.sh +++ b/nczarr_test/run_cachetest.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" set -e diff --git a/nczarr_test/run_chunkcases.sh b/nczarr_test/run_chunkcases.sh index d8f60cd62f..7a8228e681 100755 --- a/nczarr_test/run_chunkcases.sh +++ b/nczarr_test/run_chunkcases.sh @@ -13,7 +13,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. ${srcdir}/test_nczarr.sh +. ${builddir}/test_nczarr.sh set -e diff --git a/nczarr_test/run_corrupt.sh b/nczarr_test/run_corrupt.sh index 1943f600d6..95df15cb64 100755 --- a/nczarr_test/run_corrupt.sh +++ b/nczarr_test/run_corrupt.sh @@ -6,7 +6,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" set -e diff --git a/nczarr_test/run_external.sh b/nczarr_test/run_external.sh index 62a9920ef5..d74c90dace 100755 --- a/nczarr_test/run_external.sh +++ b/nczarr_test/run_external.sh @@ -5,7 +5,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi set -e -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" s3isolate "testdir_external" THISDIR=`pwd` diff --git a/nczarr_test/run_fillonlyz.sh b/nczarr_test/run_fillonlyz.sh index e9ab3e8b5d..60df1bab1d 100755 --- a/nczarr_test/run_fillonlyz.sh +++ b/nczarr_test/run_fillonlyz.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" # This shell script tests bug reported in github issue # https://github.com/Unidata/netcdf-c/issues/1826 diff --git a/nczarr_test/run_filter.sh b/nczarr_test/run_filter.sh index 20eaba526d..5a4ca37d98 100755 --- a/nczarr_test/run_filter.sh +++ b/nczarr_test/run_filter.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" set -e diff --git a/nczarr_test/run_filter_misc.sh b/nczarr_test/run_filter_misc.sh index 4f094c4a39..1ef1f14a70 100755 --- a/nczarr_test/run_filter_misc.sh +++ b/nczarr_test/run_filter_misc.sh @@ -7,7 +7,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh if test "x$TESTNCZARR" = x1; then -. ${srcdir}/test_nczarr.sh +. ${builddir}/test_nczarr.sh fi set -e diff --git a/nczarr_test/run_filter_vlen.sh b/nczarr_test/run_filter_vlen.sh index 6c38ee1832..0f8b276a5e 100755 --- a/nczarr_test/run_filter_vlen.sh +++ b/nczarr_test/run_filter_vlen.sh @@ -9,7 +9,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh if test "x$TESTNCZARR" = x1; then -. ${srcdir}/test_nczarr.sh +. ${builddir}/test_nczarr.sh fi set -e diff --git a/nczarr_test/run_filterinstall.sh b/nczarr_test/run_filterinstall.sh index f5cc612784..187ad69da7 100755 --- a/nczarr_test/run_filterinstall.sh +++ b/nczarr_test/run_filterinstall.sh @@ -11,7 +11,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh if test "x$TESTNCZARR" = x1; then -. ${srcdir}/test_nczarr.sh +. ${builddir}/test_nczarr.sh fi set -e diff --git a/nczarr_test/run_interop.sh b/nczarr_test/run_interop.sh index c50607b22d..dce1de668a 100755 --- a/nczarr_test/run_interop.sh +++ b/nczarr_test/run_interop.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" set -x set -e diff --git a/nczarr_test/run_it_chunks1.sh b/nczarr_test/run_it_chunks1.sh index e02d8b132b..535dd0ce25 100755 --- a/nczarr_test/run_it_chunks1.sh +++ b/nczarr_test/run_it_chunks1.sh @@ -6,7 +6,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" set -e diff --git a/nczarr_test/run_jsonconvention.sh b/nczarr_test/run_jsonconvention.sh index 5a906c07c6..aea0c47d74 100755 --- a/nczarr_test/run_jsonconvention.sh +++ b/nczarr_test/run_jsonconvention.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" set -e diff --git a/nczarr_test/run_misc.sh b/nczarr_test/run_misc.sh index e1c68320ef..dbe93e5955 100755 --- a/nczarr_test/run_misc.sh +++ b/nczarr_test/run_misc.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" set -x set -e diff --git a/nczarr_test/run_mud.sh b/nczarr_test/run_mud.sh index 320492b767..0c9152b561 100755 --- a/nczarr_test/run_mud.sh +++ b/nczarr_test/run_mud.sh @@ -12,7 +12,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi set -e if test "x$TESTNCZARR" = x1 ; then -. ${srcdir}/test_nczarr.sh +. ${builddir}/test_nczarr.sh s3isolate "testdir_mud4" else isolate "testdir_mud4" diff --git a/nczarr_test/run_nan.sh b/nczarr_test/run_nan.sh index 6429f56263..c0fa825457 100755 --- a/nczarr_test/run_nan.sh +++ b/nczarr_test/run_nan.sh @@ -8,13 +8,14 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" # Isolate both test and S3 s3isolate "testdir_nan" THISDIR=`pwd` cd $ISOPATH +set -x set -e # Location constants diff --git a/nczarr_test/run_nccopy5.sh b/nczarr_test/run_nccopy5.sh index 2d89abb3d0..be1bdcd4e0 100755 --- a/nczarr_test/run_nccopy5.sh +++ b/nczarr_test/run_nccopy5.sh @@ -9,7 +9,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi set -e if test "x$TESTNCZARR" = x1 ; then -. ${srcdir}/test_nczarr.sh +. ${builddir}/test_nczarr.sh s3isolate "testdir_nccopy5" else isolate testdir_ncccopy5 diff --git a/nczarr_test/run_ncgen4.sh b/nczarr_test/run_ncgen4.sh index a19d256204..83fc0f68a0 100755 --- a/nczarr_test/run_ncgen4.sh +++ b/nczarr_test/run_ncgen4.sh @@ -8,7 +8,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" # Isolate both test and S3 s3isolate "testdir_ncgen4" diff --git a/nczarr_test/run_nczarr_fill.sh b/nczarr_test/run_nczarr_fill.sh index 9856c611c0..85b434a68b 100755 --- a/nczarr_test/run_nczarr_fill.sh +++ b/nczarr_test/run_nczarr_fill.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" s3isolate "testdir_nczarr_fill" THISDIR=`pwd` diff --git a/nczarr_test/run_nczfilter.sh b/nczarr_test/run_nczfilter.sh index 2ce44ccd11..e7f3985818 100755 --- a/nczarr_test/run_nczfilter.sh +++ b/nczarr_test/run_nczfilter.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" # This shell script runs test_nczfilter.c diff --git a/nczarr_test/run_newformat.sh b/nczarr_test/run_newformat.sh index bc5691476d..fc894b848f 100755 --- a/nczarr_test/run_newformat.sh +++ b/nczarr_test/run_newformat.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" set -e diff --git a/nczarr_test/run_notzarr.sh b/nczarr_test/run_notzarr.sh index f5900dea51..eafed26d02 100755 --- a/nczarr_test/run_notzarr.sh +++ b/nczarr_test/run_notzarr.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" set -e diff --git a/nczarr_test/run_nulls.sh b/nczarr_test/run_nulls.sh index 94b8574d92..040c668c18 100755 --- a/nczarr_test/run_nulls.sh +++ b/nczarr_test/run_nulls.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" set -e diff --git a/nczarr_test/run_perf_chunks1.sh b/nczarr_test/run_perf_chunks1.sh index e08e1417f1..9d30f21507 100755 --- a/nczarr_test/run_perf_chunks1.sh +++ b/nczarr_test/run_perf_chunks1.sh @@ -9,7 +9,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" s3isolate "testdir_perf_chunks1" THISDIR=`pwd` diff --git a/nczarr_test/run_purezarr.sh b/nczarr_test/run_purezarr.sh index efe177468c..0b646c8b6a 100755 --- a/nczarr_test/run_purezarr.sh +++ b/nczarr_test/run_purezarr.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" set -e diff --git a/nczarr_test/run_quantize.sh b/nczarr_test/run_quantize.sh index 1907c62da7..9c1c2a7ab0 100755 --- a/nczarr_test/run_quantize.sh +++ b/nczarr_test/run_quantize.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" # Construct both ISOPATH and S3ISOPATH s3isolate "testdir_quantize" diff --git a/nczarr_test/run_scalar.sh b/nczarr_test/run_scalar.sh index cb601e0558..2fc7cd4972 100755 --- a/nczarr_test/run_scalar.sh +++ b/nczarr_test/run_scalar.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" set -e diff --git a/nczarr_test/run_specific_filters.sh b/nczarr_test/run_specific_filters.sh index bad0623030..89c0366d19 100755 --- a/nczarr_test/run_specific_filters.sh +++ b/nczarr_test/run_specific_filters.sh @@ -14,7 +14,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi set -e if test "x$TESTNCZARR" = x1 ; then -. ${srcdir}/test_nczarr.sh +. ${builddir}/test_nczarr.sh s3isolate "testdir_specific_filters" THISDIR=`pwd` cd $ISOPATH diff --git a/nczarr_test/run_strings.sh b/nczarr_test/run_strings.sh index a18c72550f..8c7b7f26f8 100755 --- a/nczarr_test/run_strings.sh +++ b/nczarr_test/run_strings.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" # This shell script tests support for the NC_STRING type diff --git a/nczarr_test/run_unknown.sh b/nczarr_test/run_unknown.sh index 1112bf60d1..63f63dc97e 100755 --- a/nczarr_test/run_unknown.sh +++ b/nczarr_test/run_unknown.sh @@ -11,7 +11,7 @@ THISDIR=`pwd` cd $ISOPATH if test "x$TESTNCZARR" = x1 ; then -. ${srcdir}/test_nczarr.sh +. ${builddir}/test_nczarr.sh s3isolate fi diff --git a/nczarr_test/run_unlim_io.sh b/nczarr_test/run_unlim_io.sh index aec2320003..7f00edbe05 100755 --- a/nczarr_test/run_unlim_io.sh +++ b/nczarr_test/run_unlim_io.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. ${srcdir}/test_nczarr.sh +. ${builddir}/test_nczarr.sh set -e diff --git a/nczarr_test/run_ut_map.sh b/nczarr_test/run_ut_map.sh index a6023e96c4..549dd9d83f 100755 --- a/nczarr_test/run_ut_map.sh +++ b/nczarr_test/run_ut_map.sh @@ -5,7 +5,7 @@ export SETX=1 if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. ${srcdir}/test_nczarr.sh +. ${builddir}/test_nczarr.sh set -e diff --git a/nczarr_test/run_ut_mapapi.sh b/nczarr_test/run_ut_mapapi.sh index 2e39132349..c05c164288 100755 --- a/nczarr_test/run_ut_mapapi.sh +++ b/nczarr_test/run_ut_mapapi.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" #TR="-T10" diff --git a/nczarr_test/run_ut_misc.sh b/nczarr_test/run_ut_misc.sh index 38d51258bf..3b72f4ba1b 100755 --- a/nczarr_test/run_ut_misc.sh +++ b/nczarr_test/run_ut_misc.sh @@ -3,7 +3,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" set -e diff --git a/v3.tgz b/v3.tgz deleted file mode 100644 index 7cccb11bf9c7d34f725e8f79ac9430170ee2b176..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9627 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 P7;wSsI|XqI0r7tTWzx$l diff --git a/v3_build.sh b/v3_build.sh deleted file mode 100644 index ded1a118c3..0000000000 --- a/v3_build.sh +++ /dev/null @@ -1,21 +0,0 @@ -# WARNING THIS FILE MUST BE KEPT CONSISTENT WITH v3_build.cmake - -# Copy selected V2 files from nczarr_test to v3_nczarr_test. -# We do not use AC_CONFIG_FILES but rather rely on the 'cp' program. - -# Shell scripts that are copies of same files from nczarr_test -TESTFILES_NCZARR_SH="test_nczarr.sh run_chunkcases.sh run_corrupt.sh run_external.sh run_fillonlyz.sh run_filter.sh run_filterinstall.sh run_filter_misc.sh run_filter_vlen.sh run_interop.sh run_jsonconvention.sh run_misc.sh run_nccopy5.sh run_nccopyz.sh run_ncgen4.sh run_nczarr_fill.sh run_nczfilter.sh run_newformat.sh run_notzarr.sh run_nulls.sh run_perf_chunks1.sh run_purezarr.sh run_quantize.sh run_scalar.sh run_specific_filters.sh run_strings.sh run_unknown.sh run_unlim_io.sh run_ut_map.sh run_ut_mapapi.sh run_ut_misc.sh" - -# Program files that are copies of same files from nczarr_test -TESTFILES_NCZARR_C="test_chunking.c test_filter_vlen.c test_h5_endians.c test_put_vars_two_unlim_dim.c test_quantize.c test_unlim_vars.c tst_pure_awssdk.cpp bm_utils.c timer_utils.c test_utils.c test_utils.h bm_utils.h bm_timer.h testfilter.c testfilter_multi.c testfilter_misc.c testfilter_order.c testfilter_repeat.c" - -# Script files that are copies of same files from nczarr_test -for u in ${TESTFILES_NCZARR_SH}; do -cp -f nczarr_test/$u v3_nczarr_test/$u -chmod a+x v3_nczarr_test -done - -# Program files that are copies of same files from nczarr_test -for u in ${TESTFILES_NCZARR_C}; do -cp -f nczarr_test/$u v3_nczarr_test/$u -done diff --git a/v3_nczarr_test/Makefile.am b/v3_nczarr_test/Makefile.am index 687272bc88..dc365875af 100644 --- a/v3_nczarr_test/Makefile.am +++ b/v3_nczarr_test/Makefile.am @@ -186,15 +186,41 @@ endif CLEANFILES = ut_*.txt ut*.cdl tmp*.nc tmp*.cdl tmp*.txt tmp*.dmp tmp*.zip tmp*.nc tmp*.dump tmp*.tmp tmp*.zmap tmp_ngc.c ref_zarr_test_data.cdl tst_*.nc.zip ref_quotes.zip ref_power_901_constants.zip -EXTRA_DIST += CMakeLists.txt +EXTRA_DIST += CMakeLists.txt v3manifest.am -# V3 specific files -V3FILES = run_nan.sh run_mud.sh -V3DATA = ref_nczarr2zarr.cdl ref_purezarr.cdl ref_xarray.cdl ref_misc2.cdl ref_jsonconvention.cdl ref_jsonconvention.zmap ref_nulls_zarr.baseline ref_string_zarr.baseline ref_string_nczarr.baseline ref_zarr_test_data_2d.cdl.gz ref_groups_regular.cdl ref_filtered.cdl ref_any.cdl ref_multi.cdl ref_bzip2.cdl ref_tst_mud4-bc.cdl ref_tst_mud4.cdl ref_tst_mud4_chars.cdl ref_tst_nans.cdl +include v3manifest.am -EXTRA_DIST += ${V3FILES} ${V3DATA} +EXTRA_DIST += ${V3FILES} ${V3DATA} CMakeLists.txt DISTCLEANFILES += findplugin.sh +DISTCLEANFILES += ${TESTFILES_NCZARR_C} ${TESTDATA_NCZARR} + +# Note: v3_nczarr_test is initialized with the files specified by the +# list ${V3FILES} and ${V3DATA} in v3manifest.am. The actual +# files are kept in the file ${top_srcdir}/v3init.tgz and they +# are copied into v3_nczarr_test in configure.ac. + +BUILT_SOURCES = ${TESTFILES_NCZARR_SH} ${TESTFILES_NCZARR_C} ${TESTDATA_NCZARR} + +dist-hook: setup +all-local: setup + +SRC = ${abs_top_srcdir}/nczarr_test +DST = ${abs_top_srcdir}/v3_nczarr_test +#DST = . + +.PHONY: setup +setup ${TESTFILES_NCZARR_SH} ${TESTFILES_NCZARR_C} ${TESTDATA_NCZARR}: + set -x ; for u in ${TESTFILES_NCZARR_SH}; do \ + cp -f ${SRC}/$$u ${DST}/$$u ; \ + chmod a+x ${DST}/$$u ; \ + done + set -x ; for u in ${TESTFILES_NCZARR_C} ; do \ + cp -f ${SRC}/$$u ${DST}/$$u ; \ + done + set -x; for u in ${TESTDATA_NCZARR}; do \ + cp -f ${SRC}/$$u ${DST}/$$u ; \ + done # Remove directories clean-local: @@ -208,6 +234,4 @@ endif # If valgrind is present, add valgrind targets. @VALGRIND_CHECK_RULES@ -# Construct copies of some v3 tests at build time - -DISTCLEANFILES += ${TESTFILES_NCZARR_C} ${TESTDATA_NCZARR} +################################################## diff --git a/v3_nczarr_test/run_mud.sh b/v3_nczarr_test/run_mud.sh index bc104a81d6..9d523dd438 100755 --- a/v3_nczarr_test/run_mud.sh +++ b/v3_nczarr_test/run_mud.sh @@ -12,7 +12,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi set -e if test "x$TESTNCZARR" = x1 ; then -. ${srcdir}/test_nczarr.sh +. ${builddir}/test_nczarr.sh s3isolate "testdir_mud4" else isolate "testdir_mud4" diff --git a/v3_nczarr_test/run_nan.sh b/v3_nczarr_test/run_nan.sh index a656ef1265..d4bd8f4429 100755 --- a/v3_nczarr_test/run_nan.sh +++ b/v3_nczarr_test/run_nan.sh @@ -8,7 +8,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh -. "${srcdir}/test_nczarr.sh" +. "${builddir}/test_nczarr.sh" # Isolate both test and S3 s3isolate "testdir_nan" diff --git a/v3_nczarr_test/v3manifest.am b/v3_nczarr_test/v3manifest.am new file mode 100644 index 0000000000..cd717f6910 --- /dev/null +++ b/v3_nczarr_test/v3manifest.am @@ -0,0 +1,14 @@ +# V3 specific files +V3FILES = run_nan.sh run_mud.sh +V3DATA = ref_nczarr2zarr.cdl ref_purezarr.cdl ref_xarray.cdl ref_misc2.cdl ref_jsonconvention.cdl ref_jsonconvention.zmap ref_nulls_zarr.baseline ref_string_zarr.baseline ref_string_nczarr.baseline ref_zarr_test_data_2d.cdl.gz ref_groups_regular.cdl ref_filtered.cdl ref_any.cdl ref_multi.cdl ref_bzip2.cdl ref_tst_mud4-bc.cdl ref_tst_mud4.cdl ref_tst_mud4_chars.cdl ref_tst_nans.cdl + +# Script file that are copies of same files from nczarr_test +TESTFILES_NCZARR_SH = test_nczarr.sh run_chunkcases.sh run_corrupt.sh run_external.sh run_fillonlyz.sh run_filter.sh run_filterinstall.sh run_filter_misc.sh run_filter_vlen.sh run_interop.sh run_jsonconvention.sh run_misc.sh run_nccopy5.sh run_nccopyz.sh run_ncgen4.sh run_nczarr_fill.sh run_nczfilter.sh run_newformat.sh run_notzarr.sh run_nulls.sh run_perf_chunks1.sh run_purezarr.sh run_quantize.sh run_scalar.sh run_specific_filters.sh run_strings.sh run_unknown.sh run_unlim_io.sh run_ut_map.sh run_ut_mapapi.sh run_ut_misc.sh + +# Program files that are copies of same files from nczarr_test +TESTFILES_NCZARR_C = bm_chunks3.c bm_utils.c bm_utils.h bm_timer.h test_chunkcases.c test_chunking.c test_fillonlyz.c test_filter_avail.c test_filter.c testfilter.c test_filter_misc.c testfilter_misc.c testfilter_multi.c test_filter_order.c testfilter_order.c test_filter_repeat.c testfilter_repeat.c test_filter_vlen.c test_forwardinfer.c test_grpperf.c test_h5_endians.c test_multifilter.c test_nczfilter.c test_notzarr.c test_put_vars_two_unlim_dim.c test_quantize.c test_readcaching.c test_unlim_io.c test_unlimited.c test_unlim_vars.c test_utils.c test_writecaching.c test_zchunks2.c test_zchunks3.c test_zchunks.c tst_multifilter.c timer_utils.c timer_utils.h ut_chunking.c ut_json.c ut_mapapi.c ut_map.c ut_projections.c ut_test.c ut_util.c test_nczarr_utils.h test_utils.h ut_includes.h ut_projtest.h ut_test.h ut_util.h + +TESTDATA_NCZARR = ref_nulls_nczarr.baseline ref_zarr_test_data.cdl.gz ref_avail1.cdl ref_byte.cdl ref_byte_fill_value_null.cdl ref_fillonly.cdl ref_misc1.cdl ref_ndims.cdl ref_newformatpure.cdl ref_nulls.cdl ref_oldformat.cdl ref_perdimspecs.cdl ref_power_901_constants.cdl ref_purezarr_base.cdl ref_quotes.cdl ref_rem.cdl ref_scalar.cdl ref_skip.cdl ref_skipw.cdl ref_string.cdl ref_t_meta_dim1.cdl ref_t_meta_var1.cdl ref_ut_mapapi_create.cdl ref_ut_mapapi_data.cdl ref_ut_mapapi_meta.cdl ref_ut_map_create.cdl ref_ut_map_writedata.cdl ref_ut_map_writemeta.cdl ref_ut_map_writemeta2.cdl ref_ut_testmap_create.cdl ref_whole.cdl ref_avail1.dmp ref_misc1.dmp ref_ndims.dmp ref_rem.dmp ref_noshape.file.zip ref_groups.h5 ref_notzarr.tar.gz ref_avail1.txt ref_skip.txt ref_ut_json_build.txt ref_ut_json_parse.txt ref_ut_mapapi_search.txt ref_ut_map_readmeta.txt ref_ut_map_readmeta2.txt ref_ut_map_search.txt ref_ut_proj.txt ref_whole.txt ref_byte.zarr.zip ref_byte_fill_value_null.zarr.zip ref_oldformat.zip ref_power_901_constants_orig.zip ref_quotes_orig.zip ref_cmip6.zmap + + + diff --git a/v3_nczarr_test/v3only/ref_any.cdl b/v3_nczarr_test/v3only/ref_any.cdl new file mode 100644 index 0000000000..6e2a1441cf --- /dev/null +++ b/v3_nczarr_test/v3only/ref_any.cdl @@ -0,0 +1,57 @@ +netcdf ref_any { +dimensions: + dim0 = 4 ; + dim1 = 4 ; + dim2 = 4 ; +variables: + int ivar(dim0, dim1, dim2) ; + ivar:_FillValue = -2147483647 ; + ivar:_Storage = @chunked@ ; + ivar:_ChunkSizes = 4, 4, 4 ; + ivar:_Filter = @IH5@ ; + ivar:_Codecs = @ICX@ ; + float fvar(dim0, dim1, dim2) ; + fvar:_FillValue = 9.96921e+36f ; + fvar:_Storage = @chunked@ ; + fvar:_ChunkSizes = 4, 4, 4 ; + fvar:_Filter = @FH5@ ; + fvar:_Codecs = @FCX@ ; + +data: + + ivar = + 0, 1, 2, 3, + 4, 5, 6, 7, + 8, 9, 10, 11, + 12, 13, 14, 15, + 16, 17, 18, 19, + 20, 21, 22, 23, + 24, 25, 26, 27, + 28, 29, 30, 31, + 32, 33, 34, 35, + 36, 37, 38, 39, + 40, 41, 42, 43, + 44, 45, 46, 47, + 48, 49, 50, 51, + 52, 53, 54, 55, + 56, 57, 58, 59, + 60, 61, 62, 63 ; + + fvar = + 0.5, 1.5, 2.5, 3.5, + 4.5, 5.5, 6.5, 7.5, + 8.5, 9.5, 10.5, 11.5, + 12.5, 13.5, 14.5, 15.5, + 16.5, 17.5, 18.5, 19.5, + 20.5, 21.5, 22.5, 23.5, + 24.5, 25.5, 26.5, 27.5, + 28.5, 29.5, 30.5, 31.5, + 32.5, 33.5, 34.5, 35.5, + 36.5, 37.5, 38.5, 39.5, + 40.5, 41.5, 42.5, 43.5, + 44.5, 45.5, 46.5, 47.5, + 48.5, 49.5, 50.5, 51.5, + 52.5, 53.5, 54.5, 55.5, + 56.5, 57.5, 58.5, 59.5, + 60.5, 61.5, 62.5, 63.5 ; +} diff --git a/v3_nczarr_test/v3only/ref_bzip2.cdl b/v3_nczarr_test/v3only/ref_bzip2.cdl new file mode 100644 index 0000000000..5ec01da462 --- /dev/null +++ b/v3_nczarr_test/v3only/ref_bzip2.cdl @@ -0,0 +1,84 @@ +netcdf bzip2 { +dimensions: + dim0 = 4 ; + dim1 = 4 ; + dim2 = 4 ; + dim3 = 4 ; +variables: + float var(dim0, dim1, dim2, dim3) ; + var:_Storage = "chunked" ; + var:_ChunkSizes = 4, 4, 4, 4 ; + var:_Filter = "307,9" ; + var:_Codecs = "[{\"name\": \"bz2\", \"configuration\": {\"level\": 9}}]" ; + var:_NoFill = "true" ; + +// global attributes: + :_Format = "netCDF-4" ; +data: + + var = + 0, 1, 2, 3, + 4, 5, 6, 7, + 8, 9, 10, 11, + 12, 13, 14, 15, + 16, 17, 18, 19, + 20, 21, 22, 23, + 24, 25, 26, 27, + 28, 29, 30, 31, + 32, 33, 34, 35, + 36, 37, 38, 39, + 40, 41, 42, 43, + 44, 45, 46, 47, + 48, 49, 50, 51, + 52, 53, 54, 55, + 56, 57, 58, 59, + 60, 61, 62, 63, + 64, 65, 66, 67, + 68, 69, 70, 71, + 72, 73, 74, 75, + 76, 77, 78, 79, + 80, 81, 82, 83, + 84, 85, 86, 87, + 88, 89, 90, 91, + 92, 93, 94, 95, + 96, 97, 98, 99, + 100, 101, 102, 103, + 104, 105, 106, 107, + 108, 109, 110, 111, + 112, 113, 114, 115, + 116, 117, 118, 119, + 120, 121, 122, 123, + 124, 125, 126, 127, + 128, 129, 130, 131, + 132, 133, 134, 135, + 136, 137, 138, 139, + 140, 141, 142, 143, + 144, 145, 146, 147, + 148, 149, 150, 151, + 152, 153, 154, 155, + 156, 157, 158, 159, + 160, 161, 162, 163, + 164, 165, 166, 167, + 168, 169, 170, 171, + 172, 173, 174, 175, + 176, 177, 178, 179, + 180, 181, 182, 183, + 184, 185, 186, 187, + 188, 189, 190, 191, + 192, 193, 194, 195, + 196, 197, 198, 199, + 200, 201, 202, 203, + 204, 205, 206, 207, + 208, 209, 210, 211, + 212, 213, 214, 215, + 216, 217, 218, 219, + 220, 221, 222, 223, + 224, 225, 226, 227, + 228, 229, 230, 231, + 232, 233, 234, 235, + 236, 237, 238, 239, + 240, 241, 242, 243, + 244, 245, 246, 247, + 248, 249, 250, 251, + 252, 253, 254, 255 ; +} diff --git a/v3_nczarr_test/v3only/ref_filtered.cdl b/v3_nczarr_test/v3only/ref_filtered.cdl new file mode 100644 index 0000000000..a9e1a8e642 --- /dev/null +++ b/v3_nczarr_test/v3only/ref_filtered.cdl @@ -0,0 +1,89 @@ +netcdf filtered { +dimensions: + dim0 = 4 ; + dim1 = 4 ; + dim2 = 4 ; + dim3 = 4 ; + +// global attributes: + :_Format = "netCDF-4" ; + +group: g { + variables: + float var(dim0, dim1, dim2, dim3) ; + var:_FillValue = 9.96921e+36f ; + var:_Storage = "chunked" ; + var:_ChunkSizes = 4, 4, 4, 4 ; + var:_Filter = "307,9" ; + var:_Codecs = "[{\"name\": \"bz2\", \"configuration\": {\"level\": 9}}]" ; + + // group attributes: + data: + + var = + 0, 1, 2, 3, + 4, 5, 6, 7, + 8, 9, 10, 11, + 12, 13, 14, 15, + 16, 17, 18, 19, + 20, 21, 22, 23, + 24, 25, 26, 27, + 28, 29, 30, 31, + 32, 33, 34, 35, + 36, 37, 38, 39, + 40, 41, 42, 43, + 44, 45, 46, 47, + 48, 49, 50, 51, + 52, 53, 54, 55, + 56, 57, 58, 59, + 60, 61, 62, 63, + 64, 65, 66, 67, + 68, 69, 70, 71, + 72, 73, 74, 75, + 76, 77, 78, 79, + 80, 81, 82, 83, + 84, 85, 86, 87, + 88, 89, 90, 91, + 92, 93, 94, 95, + 96, 97, 98, 99, + 100, 101, 102, 103, + 104, 105, 106, 107, + 108, 109, 110, 111, + 112, 113, 114, 115, + 116, 117, 118, 119, + 120, 121, 122, 123, + 124, 125, 126, 127, + 128, 129, 130, 131, + 132, 133, 134, 135, + 136, 137, 138, 139, + 140, 141, 142, 143, + 144, 145, 146, 147, + 148, 149, 150, 151, + 152, 153, 154, 155, + 156, 157, 158, 159, + 160, 161, 162, 163, + 164, 165, 166, 167, + 168, 169, 170, 171, + 172, 173, 174, 175, + 176, 177, 178, 179, + 180, 181, 182, 183, + 184, 185, 186, 187, + 188, 189, 190, 191, + 192, 193, 194, 195, + 196, 197, 198, 199, + 200, 201, 202, 203, + 204, 205, 206, 207, + 208, 209, 210, 211, + 212, 213, 214, 215, + 216, 217, 218, 219, + 220, 221, 222, 223, + 224, 225, 226, 227, + 228, 229, 230, 231, + 232, 233, 234, 235, + 236, 237, 238, 239, + 240, 241, 242, 243, + 244, 245, 246, 247, + 248, 249, 250, 251, + 252, 253, 254, 255 ; + } // group g +} diff --git a/v3_nczarr_test/v3only/ref_groups_regular.cdl b/v3_nczarr_test/v3only/ref_groups_regular.cdl new file mode 100644 index 0000000000..e0e930fab9 --- /dev/null +++ b/v3_nczarr_test/v3only/ref_groups_regular.cdl @@ -0,0 +1,47 @@ +netcdf tmp_groups_regular { + +// global attributes: + :_Format = "netCDF-4" ; + +group: MyGroup { + dimensions: + phony_dim_2 = 3 ; + phony_dim_3 = 3 ; + variables: + int dset1(phony_dim_2, phony_dim_3) ; + dset1:_Storage = "chunked" ; + dset1:_ChunkSizes = 3, 3 ; + dset1:_NoFill = "true" ; + + // group attributes: + data: + + dset1 = + 1, 2, 3, + 1, 2, 3, + 1, 2, 3 ; + + group: Group_A { + dimensions: + phony_dim_0 = 2 ; + phony_dim_1 = 10 ; + variables: + int dset2(phony_dim_0, phony_dim_1) ; + dset2:_Storage = "chunked" ; + dset2:_ChunkSizes = 2, 10 ; + dset2:_NoFill = "true" ; + + // group attributes: + data: + + dset2 = + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ; + } // group Group_A + + group: Group_B { + + // group attributes: + } // group Group_B + } // group MyGroup +} diff --git a/v3_nczarr_test/v3only/ref_jsonconvention.cdl b/v3_nczarr_test/v3only/ref_jsonconvention.cdl new file mode 100644 index 0000000000..f3b5c9530e --- /dev/null +++ b/v3_nczarr_test/v3only/ref_jsonconvention.cdl @@ -0,0 +1,21 @@ +netcdf tmp_jsonconvention { +dimensions: + d1 = 1 ; +variables: + int v(d1) ; + v:varjson1 = "{\"key1\": [1,2,3], \"key2\": {\"key3\": \"abc\"}}" ; + v:varjson2 = "[[1.0,0.0,0.0],[0.0,1.0,0.0],[0.0,0.0,1.0]]" ; + v:varvec1 = "1.0, 0.0, 0.0" ; + v:varvec2 = "[0.,0.,1.]" ; + v:_FillValue = -2147483647 ; + +// global attributes: + :globalfloat = 1. ; + :globalfloatvec = 1., 2. ; + :globalchar = "abc" ; + :globalillegal = "[ [ 1.0, 0.0, 0.0 ], [ 0.0, 1.0, 0.0 ], [ 0.0, 0.0, 1.0 " ; + :globaljson = "[0.,0.,1.]" ; +data: + + v = _ ; +} diff --git a/v3_nczarr_test/v3only/ref_jsonconvention.zmap b/v3_nczarr_test/v3only/ref_jsonconvention.zmap new file mode 100644 index 0000000000..6cbcfbc6c7 --- /dev/null +++ b/v3_nczarr_test/v3only/ref_jsonconvention.zmap @@ -0,0 +1,3 @@ +[0] /v/c/0 : () (ubyte) |...| +[1] /v/zarr.json : () |{"node_type": "array", "zarr_format": 3, "data_type": "int32", "fill_value": -2147483647, "shape": [1], "chunk_grid": {"name": "regular", "configuration": {"chunk_shape": [1]}}, "chunk_key_encoding": {"name": "default", "configuration": {"separator": "/"}}, "dimension_names": ["d1"], "codecs": [{"name": "bytes", "configuration": {"endian": "little"}}], "attributes": {"varjson1": {"key1": [1,2,3], "key2": {"key3": "abc"}}, "varjson2": [[1.0,0.0,0.0],[0.0,1.0,0.0],[0.0,0.0,1.0]], "varvec1": "1.0, 0.0, 0.0", "varvec2": [0.,0.,1.], "_FillValue": -2147483647, "_ARRAY_DIMENSIONS": ["d1"], "_nczarr_array": {"dimension_references": ["/d1"], "storage": "chunked"}, "_nczarr_attrs": {"attribute_types": {"varjson1": "json", "varjson2": "json", "varvec1": "char", "varvec2": "json", "_FillValue": "int32", "_ARRAY_DIMENSIONS": "json", "_nczarr_array": "json", "_nczarr_attrs": "json"}}}}| +[2] /zarr.json : () |{"node_type": "group", "zarr_format": 3, "attributes": {"globalfloat": 1, "globalfloatvec": [1,2], "globalchar": "abc", "globalillegal": "[ [ 1.0, 0.0, 0.0 ], [ 0.0, 1.0, 0.0 ], [ 0.0, 0.0, 1.0 ", "globaljson": [0.,0.,1.], "_NCProperties": "version=2,netcdf=0.0.0,nczarr=0.0.0", "_nczarr_group": {"dimensions": {"d1": {"size": 1, "unlimited": 0}}, "arrays": ["v"], "groups": []}, "_nczarr_superblock": {"version": "0.0.0", "format": 2}, "_nczarr_attrs": {"attribute_types": {"globalfloat": "float64", "globalfloatvec": "float64", "globalchar": "char", "globalillegal": "char", "globaljson": "json", "_NCProperties": "char", "_nczarr_group": "json", "_nczarr_superblock": "json", "_nczarr_attrs": "json"}}}}| diff --git a/v3_nczarr_test/v3only/ref_misc2.cdl b/v3_nczarr_test/v3only/ref_misc2.cdl new file mode 100644 index 0000000000..8d40a16020 --- /dev/null +++ b/v3_nczarr_test/v3only/ref_misc2.cdl @@ -0,0 +1,13 @@ +netcdf tmp_misc2 { +dimensions: + d0 = 2; + d1 = 2; +variables: + int v(d0, d1) ; + v:_FillValue = -2147483647 ; +data: + + v = + 0, 1, + 2, 3 ; +} diff --git a/v3_nczarr_test/v3only/ref_multi.cdl b/v3_nczarr_test/v3only/ref_multi.cdl new file mode 100644 index 0000000000..0cd9699c6e --- /dev/null +++ b/v3_nczarr_test/v3only/ref_multi.cdl @@ -0,0 +1,17 @@ +netcdf multifilter { +dimensions: + dim0 = 4 ; + dim1 = 4 ; + dim2 = 4 ; + dim3 = 4 ; +variables: + float var(dim0, dim1, dim2, dim3) ; + var:_Storage = "chunked" ; + var:_ChunkSizes = 4, 4, 4, 4 ; + var:_Filter = "307,9|1,2|40000" ; + var:_Codecs = "[{\"name\": \"bz2\", \"configuration\": {\"level\": 9}},{\"name\": \"zlib\", \"configuration\": {\"level\": 2}},{\"name\": \"noop\", \"configuration\": {\"hdf5raw\": \"1\", \"nparams\": 0}}]" ; + var:_NoFill = "true" ; + +// global attributes: + :_Format = "netCDF-4" ; +} diff --git a/v3_nczarr_test/v3only/ref_nczarr2zarr.cdl b/v3_nczarr_test/v3only/ref_nczarr2zarr.cdl new file mode 100644 index 0000000000..c9208518f7 --- /dev/null +++ b/v3_nczarr_test/v3only/ref_nczarr2zarr.cdl @@ -0,0 +1,19 @@ +netcdf nczarr2zarr { +dimensions: + d0 = 8 ; + d1 = 8 ; +variables: + int v(d0, d1) ; + v:_FillValue = -1 ; +data: + + v = + _, _, _, _, _, _, _, _, + _, _, _, _, _, _, _, _, + _, _, _, _, _, _, _, _, + _, _, _, _, _, _, _, _, + _, _, _, _, 0, 1, 2, 3, + _, _, _, _, 4, 5, 6, 7, + _, _, _, _, 8, 9, 10, 11, + _, _, _, _, 12, 13, 14, 15 ; +} diff --git a/v3_nczarr_test/v3only/ref_nulls_zarr.baseline b/v3_nczarr_test/v3only/ref_nulls_zarr.baseline new file mode 100644 index 0000000000..8baefe949a --- /dev/null +++ b/v3_nczarr_test/v3only/ref_nulls_zarr.baseline @@ -0,0 +1,13 @@ +netcdf ref_nulls { +variables: + int test ; + test:nul_sng = 0 ; + test:empty_sng = "" ; + test:space_sng = " " ; + test:zero_sng = "0" ; + test:nul0 = 0 ; + test:_FillValue = -2147483647 ; +data: + + test = 1 ; +} diff --git a/v3_nczarr_test/v3only/ref_purezarr.cdl b/v3_nczarr_test/v3only/ref_purezarr.cdl new file mode 100644 index 0000000000..512e9a0510 --- /dev/null +++ b/v3_nczarr_test/v3only/ref_purezarr.cdl @@ -0,0 +1,13 @@ +netcdf tmp_purezarr { +dimensions: + x = 2 ; + y = 5 ; +variables: + int i(x, y) ; + i:_FillValue = -2147483647 ; +data: + + i = + _, _, _, _, _, + _, _, _, _, _ ; +} diff --git a/v3_nczarr_test/v3only/ref_string_nczarr.baseline b/v3_nczarr_test/v3only/ref_string_nczarr.baseline new file mode 100644 index 0000000000..6e52bf43f8 --- /dev/null +++ b/v3_nczarr_test/v3only/ref_string_nczarr.baseline @@ -0,0 +1,24 @@ +netcdf ref_string { +dimensions: + d2 = 2 ; +variables: + char c(d2) ; + c:_FillValue = "" ; + string v(d2) ; + string v:_FillValue = "" ; + string truncated ; + string truncated:_FillValue = "" ; + truncated:_nczarr_maxstrlen = 4 ; + +// global attributes: + string :stringattr = "abc", "def" ; + :charattr = "ghijkl" ; + :_nczarr_default_maxstrlen = 6 ; +data: + + c = "ab" ; + + v = "uvw", "xyz" ; + + truncated = "0123" ; +} diff --git a/v3_nczarr_test/v3only/ref_string_zarr.baseline b/v3_nczarr_test/v3only/ref_string_zarr.baseline new file mode 100644 index 0000000000..f9b0557b58 --- /dev/null +++ b/v3_nczarr_test/v3only/ref_string_zarr.baseline @@ -0,0 +1,24 @@ +netcdf ref_string { +dimensions: + d2 = 2 ; +variables: + ubyte c(d2) ; + c:_FillValue = 0UB ; + string v(d2) ; + string v:_FillValue = "" ; + string truncated ; + truncated:_nczarr_maxstrlen = 4 ; + string truncated:_FillValue = "" ; + +// global attributes: + string :stringattr = "abc", "def" ; + :charattr = "ghijkl" ; + :_nczarr_default_maxstrlen = 6 ; +data: + + c = 97, 98 ; + + v = "uvw", "xyz" ; + + truncated = "0123" ; +} diff --git a/v3_nczarr_test/v3only/ref_tst_mud4-bc.cdl b/v3_nczarr_test/v3only/ref_tst_mud4-bc.cdl new file mode 100644 index 0000000000..9756367b29 --- /dev/null +++ b/v3_nczarr_test/v3only/ref_tst_mud4-bc.cdl @@ -0,0 +1,189 @@ +netcdf tst_mud4 { +dimensions: + F0 = 1 ; + F1 = 2 ; + F2 = 3 ; + F3 = 5 ; + U0 = UNLIMITED ; // (1 currently) + U1 = UNLIMITED ; // (2 currently) + U2 = UNLIMITED ; // (3 currently) + U3 = UNLIMITED ; // (5 currently) +variables: + int ff(F1, F2) ; + ff:_FillValue = -2147483647 ; + int uf(U1, F2) ; + uf:_FillValue = -2147483647 ; + int fu(F1, U2) ; + fu:_FillValue = -2147483647 ; + int uu(U1, U2) ; + uu:_FillValue = -2147483647 ; + int ufff(U0, F1, F2, F3) ; + ufff:_FillValue = -2147483647 ; + int uffu(U0, F1, F2, U3) ; + uffu:_FillValue = -2147483647 ; + int ufuf(U0, F1, U2, F3) ; + ufuf:_FillValue = -2147483647 ; + int ufuu(U0, F1, U2, U3) ; + ufuu:_FillValue = -2147483647 ; + int uuff(U0, U1, F2, F3) ; + uuff:_FillValue = -2147483647 ; + int uufu(U0, U1, F2, U3) ; + uufu:_FillValue = -2147483647 ; + int uuuf(U0, U1, U2, F3) ; + uuuf:_FillValue = -2147483647 ; + int uuuu(U0, U1, U2, U3) ; + uuuu:_FillValue = -2147483647 ; + int ffff(F0, F1, F2, F3) ; + ffff:_FillValue = -2147483647 ; +data: + + ff = + // ff(0, 0-2) + 1, 2, 3, + // ff(1, 0-2) + 4, 5, 6 ; + + uf = + // uf(0, 0-2) + 1, 2, 3, + // uf(1, 0-2) + 4, 5, 6 ; + + fu = + {// fu(0, 0-2) + 1, 2, 3}, + {// fu(1, 0-2) + 4, 5, 6} ; + + uu = + {// uu(0, 0-2) + 1, 2, 3}, + {// uu(1, 0-2) + 4, 5, 6} ; + + ufff = + // ufff(0,0,0, 0-4) + 1, 2, 3, 4, 5, + // ufff(0,0,1, 0-4) + 6, 7, 8, 9, 10, + // ufff(0,0,2, 0-4) + 11, 12, 13, 14, 15, + // ufff(0,1,0, 0-4) + 16, 17, 18, 19, 20, + // ufff(0,1,1, 0-4) + 21, 22, 23, 24, 25, + // ufff(0,1,2, 0-4) + 26, 27, 28, 29, 30 ; + + uffu = + {// uffu(0,0,0, 0-4) + 1, 2, 3, 4, 5}, + {// uffu(0,0,1, 0-4) + 6, 7, 8, 9, 10}, + {// uffu(0,0,2, 0-4) + 11, 12, 13, 14, 15}, + {// uffu(0,1,0, 0-4) + 16, 17, 18, 19, 20}, + {// uffu(0,1,1, 0-4) + 21, 22, 23, 24, 25}, + {// uffu(0,1,2, 0-4) + 26, 27, 28, 29, 30} ; + + ufuf = + {// ufuf(0,0,0, 0-4) + 1, 2, 3, 4, 5, + // ufuf(0,0,1, 0-4) + 6, 7, 8, 9, 10, + // ufuf(0,0,2, 0-4) + 11, 12, 13, 14, 15}, + {// ufuf(0,1,0, 0-4) + 16, 17, 18, 19, 20, + // ufuf(0,1,1, 0-4) + 21, 22, 23, 24, 25, + // ufuf(0,1,2, 0-4) + 26, 27, 28, 29, 30} ; + + ufuu = + {{// ufuu(0,0,0, 0-4) + 1, 2, 3, 4, 5}, + {// ufuu(0,0,1, 0-4) + 6, 7, 8, 9, 10}, + {// ufuu(0,0,2, 0-4) + 11, 12, 13, 14, 15}}, + {{// ufuu(0,1,0, 0-4) + 16, 17, 18, 19, 20}, + {// ufuu(0,1,1, 0-4) + 21, 22, 23, 24, 25}, + {// ufuu(0,1,2, 0-4) + 26, 27, 28, 29, 30}} ; + + uuff = + {// uuff(0,0,0, 0-4) + 1, 2, 3, 4, 5, + // uuff(0,0,1, 0-4) + 6, 7, 8, 9, 10, + // uuff(0,0,2, 0-4) + 11, 12, 13, 14, 15, + // uuff(0,1,0, 0-4) + 16, 17, 18, 19, 20, + // uuff(0,1,1, 0-4) + 21, 22, 23, 24, 25, + // uuff(0,1,2, 0-4) + 26, 27, 28, 29, 30} ; + + uufu = + {{// uufu(0,0,0, 0-4) + 1, 2, 3, 4, 5}, + {// uufu(0,0,1, 0-4) + 6, 7, 8, 9, 10}, + {// uufu(0,0,2, 0-4) + 11, 12, 13, 14, 15}, + {// uufu(0,1,0, 0-4) + 16, 17, 18, 19, 20}, + {// uufu(0,1,1, 0-4) + 21, 22, 23, 24, 25}, + {// uufu(0,1,2, 0-4) + 26, 27, 28, 29, 30}} ; + + uuuf = + {{// uuuf(0,0,0, 0-4) + 1, 2, 3, 4, 5, + // uuuf(0,0,1, 0-4) + 6, 7, 8, 9, 10, + // uuuf(0,0,2, 0-4) + 11, 12, 13, 14, 15}, + {// uuuf(0,1,0, 0-4) + 16, 17, 18, 19, 20, + // uuuf(0,1,1, 0-4) + 21, 22, 23, 24, 25, + // uuuf(0,1,2, 0-4) + 26, 27, 28, 29, 30}} ; + + uuuu = + {{{// uuuu(0,0,0, 0-4) + 1, 2, 3, 4, 5}, + {// uuuu(0,0,1, 0-4) + 6, 7, 8, 9, 10}, + {// uuuu(0,0,2, 0-4) + 11, 12, 13, 14, 15}}, + {{// uuuu(0,1,0, 0-4) + 16, 17, 18, 19, 20}, + {// uuuu(0,1,1, 0-4) + 21, 22, 23, 24, 25}, + {// uuuu(0,1,2, 0-4) + 26, 27, 28, 29, 30}}} ; + + ffff = + // ffff(0,0,0, 0-4) + 1, 2, 3, 4, 5, + // ffff(0,0,1, 0-4) + 6, 7, 8, 9, 10, + // ffff(0,0,2, 0-4) + 11, 12, 13, 14, 15, + // ffff(0,1,0, 0-4) + 16, 17, 18, 19, 20, + // ffff(0,1,1, 0-4) + 21, 22, 23, 24, 25, + // ffff(0,1,2, 0-4) + 26, 27, 28, 29, 30 ; +} diff --git a/v3_nczarr_test/v3only/ref_tst_mud4.cdl b/v3_nczarr_test/v3only/ref_tst_mud4.cdl new file mode 100644 index 0000000000..2004607cb3 --- /dev/null +++ b/v3_nczarr_test/v3only/ref_tst_mud4.cdl @@ -0,0 +1,127 @@ +netcdf tst_mud4 { +dimensions: + F0 = 1 ; + F1 = 2 ; + F2 = 3 ; + F3 = 5 ; + U0 = UNLIMITED ; // (1 currently) + U1 = UNLIMITED ; // (2 currently) + U2 = UNLIMITED ; // (3 currently) + U3 = UNLIMITED ; // (5 currently) +variables: + int ff(F1, F2) ; + ff:_FillValue = -2147483647 ; + int uf(U1, F2) ; + uf:_FillValue = -2147483647 ; + int fu(F1, U2) ; + fu:_FillValue = -2147483647 ; + int uu(U1, U2) ; + uu:_FillValue = -2147483647 ; + int ufff(U0, F1, F2, F3) ; + ufff:_FillValue = -2147483647 ; + int uffu(U0, F1, F2, U3) ; + uffu:_FillValue = -2147483647 ; + int ufuf(U0, F1, U2, F3) ; + ufuf:_FillValue = -2147483647 ; + int ufuu(U0, F1, U2, U3) ; + ufuu:_FillValue = -2147483647 ; + int uuff(U0, U1, F2, F3) ; + uuff:_FillValue = -2147483647 ; + int uufu(U0, U1, F2, U3) ; + uufu:_FillValue = -2147483647 ; + int uuuf(U0, U1, U2, F3) ; + uuuf:_FillValue = -2147483647 ; + int uuuu(U0, U1, U2, U3) ; + uuuu:_FillValue = -2147483647 ; + int ffff(F0, F1, F2, F3) ; + ffff:_FillValue = -2147483647 ; +data: + + ff = + 1, 2, 3, + 4, 5, 6 ; + + uf = + 1, 2, 3, + 4, 5, 6 ; + + fu = + {1, 2, 3}, + {4, 5, 6} ; + + uu = + {1, 2, 3}, + {4, 5, 6} ; + + ufff = + 1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30 ; + + uffu = + {1, 2, 3, 4, 5}, + {6, 7, 8, 9, 10}, + {11, 12, 13, 14, 15}, + {16, 17, 18, 19, 20}, + {21, 22, 23, 24, 25}, + {26, 27, 28, 29, 30} ; + + ufuf = + {1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15}, + {16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30} ; + + ufuu = + {{1, 2, 3, 4, 5}, + {6, 7, 8, 9, 10}, + {11, 12, 13, 14, 15}}, + {{16, 17, 18, 19, 20}, + {21, 22, 23, 24, 25}, + {26, 27, 28, 29, 30}} ; + + uuff = + {1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30} ; + + uufu = + {{1, 2, 3, 4, 5}, + {6, 7, 8, 9, 10}, + {11, 12, 13, 14, 15}, + {16, 17, 18, 19, 20}, + {21, 22, 23, 24, 25}, + {26, 27, 28, 29, 30}} ; + + uuuf = + {{1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15}, + {16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30}} ; + + uuuu = + {{{1, 2, 3, 4, 5}, + {6, 7, 8, 9, 10}, + {11, 12, 13, 14, 15}}, + {{16, 17, 18, 19, 20}, + {21, 22, 23, 24, 25}, + {26, 27, 28, 29, 30}}} ; + + ffff = + 1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30 ; +} diff --git a/v3_nczarr_test/v3only/ref_tst_mud4_chars.cdl b/v3_nczarr_test/v3only/ref_tst_mud4_chars.cdl new file mode 100644 index 0000000000..ca1d27f7a8 --- /dev/null +++ b/v3_nczarr_test/v3only/ref_tst_mud4_chars.cdl @@ -0,0 +1,127 @@ +netcdf tst_mud4_chars { +dimensions: + F1 = 1 ; + F2 = 2 ; + F3 = 3 ; + F5 = 5 ; + U1 = UNLIMITED ; // (1 currently) + U2 = UNLIMITED ; // (2 currently) + U3 = UNLIMITED ; // (3 currently) + U5 = UNLIMITED ; // (5 currently) +variables: + char ff(F2, F3) ; + ff:_FillValue = "" ; + char uf(U2, F3) ; + uf:_FillValue = "" ; + char fu(F2, U3) ; + fu:_FillValue = "" ; + char uu(U2, U3) ; + uu:_FillValue = "" ; + char ufff(U1, F2, F3, F5) ; + ufff:_FillValue = "" ; + char uffu(U1, F2, F3, U5) ; + uffu:_FillValue = "" ; + char ufuf(U1, F2, U3, F5) ; + ufuf:_FillValue = "" ; + char ufuu(U1, F2, U3, U5) ; + ufuu:_FillValue = "" ; + char uuff(U1, U2, F3, F5) ; + uuff:_FillValue = "" ; + char uufu(U1, U2, F3, U5) ; + uufu:_FillValue = "" ; + char uuuf(U1, U2, U3, F5) ; + uuuf:_FillValue = "" ; + char uuuu(U1, U2, U3, U5) ; + uuuu:_FillValue = "" ; + char ffff(F1, F2, F3, F5) ; + ffff:_FillValue = "" ; +data: + + ff = + "abc", + "def" ; + + uf = + "abc", + "def" ; + + fu = + {"efg"}, + {"hij"} ; + + uu = + {"efg"}, + {"hij"} ; + + ufff = + "efghi", + "jklmJ", + "KLMNO", + "PQRST", + "UVWXY", + "Zabcd" ; + + uffu = + {"efghi"}, + {"jklmJ"}, + {"KLMNO"}, + {"PQRST"}, + {"UVWXY"}, + {"Zabcd"} ; + + ufuf = + {"efghi", + "jklmJ", + "KLMNO"}, + {"PQRST", + "UVWXY", + "Zabcd"} ; + + ufuu = + {{"efghi"}, + {"jklmJ"}, + {"KLMNO"}}, + {{"PQRST"}, + {"UVWXY"}, + {"Zabcd"}} ; + + uuff = + {"efghi", + "jklmJ", + "KLMNO", + "PQRST", + "UVWXY", + "Zabcd"} ; + + uufu = + {{"efghi"}, + {"jklmJ"}, + {"KLMNO"}, + {"PQRST"}, + {"UVWXY"}, + {"Zabcd"}} ; + + uuuf = + {{"efghi", + "jklmJ", + "KLMNO"}, + {"PQRST", + "UVWXY", + "Zabcd"}} ; + + uuuu = + {{{"efghi"}, + {"jklmJ"}, + {"KLMNO"}}, + {{"PQRST"}, + {"UVWXY"}, + {"Zabcd"}}} ; + + ffff = + "efghi", + "jklmJ", + "KLMNO", + "PQRST", + "UVWXY", + "Zabcd" ; +} diff --git a/v3_nczarr_test/v3only/ref_tst_nans.cdl b/v3_nczarr_test/v3only/ref_tst_nans.cdl new file mode 100644 index 0000000000..d7854c0b20 --- /dev/null +++ b/v3_nczarr_test/v3only/ref_tst_nans.cdl @@ -0,0 +1,16 @@ +netcdf ref_tst_nans { +dimensions: + dim = 3 ; +variables: + double dvar(dim) ; + dvar:_FillValue = NaN ; + dvar:datt = -Infinity, NaN, Infinity ; + float fvar(dim) ; + fvar:_FillValue = NaNf ; + fvar:fatt = -Infinityf, NaNf, Infinityf ; +data: + + dvar = -Infinity, _, Infinity ; + + fvar = -Infinityf, _, Infinityf ; +} diff --git a/v3_nczarr_test/v3only/ref_xarray.cdl b/v3_nczarr_test/v3only/ref_xarray.cdl new file mode 100644 index 0000000000..9689897b4d --- /dev/null +++ b/v3_nczarr_test/v3only/ref_xarray.cdl @@ -0,0 +1,13 @@ +netcdf tmp_xarray { +dimensions: + x = 2 ; + y = 5 ; +variables: + int i(x, y) ; + i:_FillValue = -2147483647 ; +data: + + i = + _, _, _, _, _, + _, _, _, _, _ ; +} diff --git a/v3_nczarr_test/v3only/ref_zarr_test_data_2d.cdl.gz b/v3_nczarr_test/v3only/ref_zarr_test_data_2d.cdl.gz new file mode 100644 index 0000000000000000000000000000000000000000..91ada31bc071337bd524f2fff4beaeab8a962f60 GIT binary patch literal 379 zcmV->0fhb^iwFpE&Y@)h19D|%UwUD3a$j_1b97&1VRT_%GGs1eWNZNKm0wH4Fcig~ zn@@4slR{von}1f>gE0IWA+xOubV*55WtDw*Pg-&6I%dVkzO*6tcMi$DrN?CcDb1-- z&PktDUZ%<`dSj{HW~S2CR0)gZgRy3}wRI&|dMo2AS`r@jj6FMBmkG5m`KtX!LRdjh z^rDmq{zQKXFzJ7RTlWOfOo0}=NSoX&`5zZ0GHng7}6q;=?L!m#KrM@uY03r;bo z8K*g?Yfd+uZaLj?TA&ols0#oBga9JI2tWdq045fE^cj6dpV4RZ`B$Izr@g1?v tmp_mud4.cdl +# echo "*** comparing tst_mud4.cdl with ref_tst_mud4.cdl..." +diff -b tmp_mud4.cdl $refdir/ref_tst_mud4.cdl +# echo "*** comparing annotation from ncdump -bc $file with expected output..." +${NCDUMP} -n tst_mud4 -bc $file > tmp_mud4-bc.cdl +diff -b tmp_mud4-bc.cdl $refdir/ref_tst_mud4-bc.cdl + +# Now test with char arrays instead of ints +if test "x$TESTNCZARR" = x1 ; then +fileargs "tmp_mud4_chars${zext}" +deletemap $zext $file +file="$fileurl" +else +file="tmp_mud4_chars${zext}.nc" +rm -f $file +fi +echo "*** creating netcdf file $file from ref_tst_mud4_chars.cdl ..." +${NCGEN} -4 -b -o $file $refdir/ref_tst_mud4_chars.cdl +echo "*** creating ${file}.cdl from $file ..." +${NCDUMP} -n tst_mud4_chars $file > tmp_mud4_chars.cdl +# echo "*** comparing tmp_mud4_chars.cdl with ref_tst_mud4_chars.cdl..." +diff -b tmp_mud4_chars.cdl $refdir/ref_tst_mud4_chars.cdl +if test 1 = 0 ; then + # unused + echo "*** comparing annotation from ncdump -bc tst_mud4_chars.nc with expected output..." + ${NCDUMP} -n tst_mud4_chars -bc $file > tmp_mud4_chars-bc.cdl + diff -b tmp_mud4_chars-bc.cdl $refdir/ref_tst_mud4_chars-bc.cdl + echo "*** All ncdump test output for multiple unlimited dimensions passed!" +fi +} + +if test "x$TESTNCZARR" = x1 ; then + testcase file + if test "x$FEATURE_NCZARR_ZIP" = xyes ; then testcase zip ; fi + if test "x$FEATURE_S3TESTS" = xyes ; then testcase s3 ; fi +else + testcase nc +fi + +exit 0 diff --git a/v3_nczarr_test/v3only/run_nan.sh b/v3_nczarr_test/v3only/run_nan.sh new file mode 100644 index 0000000000..d4bd8f4429 --- /dev/null +++ b/v3_nczarr_test/v3only/run_nan.sh @@ -0,0 +1,60 @@ +#!/bin/sh +# Tests for ncgen4 using list of test cdl files from the cdl4 +# directory, and comparing output to expected results in the expected4 +# directory. Note that these tests are run for classic files in +# test_ncgen4_classic.sh +# Dennis Heimbigner + +if test "x$srcdir" = x ; then srcdir=`pwd`; fi +. ../test_common.sh + +. "${builddir}/test_nczarr.sh" + +# Isolate both test and S3 +s3isolate "testdir_nan" +THISDIR=`pwd` +cd $ISOPATH + +set -e + +# Functions + +# Remove fillvalue attribute since zarr generates it when hdf5 does not +fvclean() { + cat $1 \ + | sed -e '/:_FillValue/d' \ + | cat > $2 +} + +difftest() { +echo ""; echo "*** Test zext=$zext" +for t in tst_nans ; do + echo "*** Testing: ${t}" + # determine if we need the specflag set + # determine properties + checkprops ${t} + ref="ref_${t}" + rm -fr ${t}.$zext + rm -f tmp_${t}.dmp + fileargs $t + ${NCGEN} -4 -lb -o ${fileurl} ${srcdir}/${ref}.cdl +${ZMD} -h -t float ${fileurl} + ${NCDUMP} ${headflag} ${specflag} -n ${ref} ${fileurl} > tmp_${t}.dmp + # compare against expected + diff -b -w ${srcdir}/${ref}.cdl ./tmp_${t}.dmp + echo "*** SUCCEED: ${t}" +done +} + +runtestset() { +extfor $1 +echo "*** Testing nans for Zarr Format 3 for nczarr X ncgen with zmap=${zext}" +difftest +echo "*** PASSED: zext=${zext}" +} + +runtestset file +if test "x$FEATURE_NCZARR_ZIP" = xyes ; then runtestset zip; fi +if test "x$FEATURE_S3TESTS" = xyes ; then runtestset s3; fi + +echo "*** PASSED ***"