mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into ejh_z2

Browse Source
This commit is contained in:
Ed 2024-08-16 13:03:15 -06:00
commit 5a45c0f36f
7 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -930,6 +930,7 @@ include(cmake/dependencies.cmake)
set(STATUS_PARALLEL "OFF")
set(IMPORT_MPI "")
option(NETCDF_ENABLE_PARALLEL4 "Build netCDF-4 with parallel IO" "${HDF5_PARALLEL}")
option(NETCDF_MPIEXEC "Command to use instead of mpiexec to launch parallel I/O tests" OFF)
if(NETCDF_ENABLE_PARALLEL4 AND NETCDF_ENABLE_HDF5)
if(NOT HDF5_PARALLEL)
set(USE_PARALLEL OFF CACHE BOOL "")
@ -939,6 +940,10 @@ if(NETCDF_ENABLE_PARALLEL4 AND NETCDF_ENABLE_HDF5)
set(USE_PARALLEL ON CACHE BOOL "")
set(USE_PARALLEL4 ON CACHE BOOL "")
set(STATUS_PARALLEL "ON")
if(NETCDF_MPIEXEC)
set(MPIEXEC "${NETCDF_MPIEXEC}")
endif()
message(STATUS "MPIEXEC command will be ${MPIEXEC}")
configure_file("${netCDF_SOURCE_DIR}/nc_test4/run_par_test.sh.in"
"${netCDF_BINARY_DIR}/tmp/run_par_test.sh" @ONLY NEWLINE_STYLE LF)
file(COPY "${netCDF_BINARY_DIR}/tmp/run_par_test.sh"

2
RELEASE_NOTES.md
View File

@ -7,7 +7,7 @@ This file contains a high-level description of this package's evolution. Release
## 4.9.3 - TBD
* Provide better documentation for the .rc file mechanism and API. See [Github #????](https://github.com/Unidata/netcdf-c/pull/????) for more information.
* Provide better documentation for the .rc file mechanism and API. See [Github #2956](https://github.com/Unidata/netcdf-c/pull/2956) for more information.
* Convert NCZarr V2 to store all netcdf-4 specific info as attributes. This improves interoperability with other Zarr implementations by no longer using non-standard keys. The price to be paid is that lazy attribute reading cannot be supported. See [Github #2836](https://github.com/Unidata/netcdf-c/pull/2936) for more information.
* Cleanup the option code for NETCDF_ENABLE_SET_LOG_LEVEL\[_FUNC\] See [Github #2931](https://github.com/Unidata/netcdf-c/pull/2931) for more information.
*

11
libnczarr/zsync.c
View File

@ -1513,7 +1513,7 @@ define_var1(NC_FILE_INFO_T* file, NC_GRP_INFO_T* grp, const char* varname)
if(jvalue != NULL)
var->storage = NC_CHUNKED;
/* Extract dimrefs list */
if((stat = dictgetalt(jncvar,"dimension_references","dimensions",&jdimrefs))) goto done;
if((stat = dictgetalt(jncvar,"dimension_references","dimrefs",&jdimrefs))) goto done;
if(jdimrefs != NULL) { /* Extract the dimref names */
assert((NCJsort(jdimrefs) == NCJ_ARRAY));
if(zvar->scalar) {
@ -1851,7 +1851,7 @@ ncz_read_superblock(NC_FILE_INFO_T* file, char** nczarrvp, char** zarrfp)
if(jsuper != NULL) {
if(jsuper->sort != NCJ_DICT) {stat = NC_ENCZARR; goto done;}
if((stat = NCJdictget(jsuper,"version",&jtmp))<0) {stat = NC_EINVAL; goto done;}
if((stat = dictgetalt(jsuper,"nczarr_version","version",&jtmp))<0) {stat = NC_EINVAL; goto done;}
nczarr_version = nulldup(NCJstring(jtmp));
}
@ -2572,14 +2572,13 @@ getnczarrkey(NC_OBJ* container, const char* name, const NCjson** jncxxxp)
jxxx = NULL;
if((stat = NCJdictget(zobj->atts,name,&jxxx))<0) {stat = NC_EINVAL; goto done;}
}
if(name == NULL) {
jxxx = NULL;
if(jxxx == NULL) {
/* Try .zxxx second */
if(zobj->obj != NULL) {
if((stat = NCJdictget(zobj->obj,name,&jxxx))<0) {stat = NC_EINVAL; goto done;}
}
/* Mark as old style with _nczarr_xxx in obj not attributes */
zobj->nczv1 = 1;
if(jxxx != NULL)
zobj->nczv1 = 1; /* Mark as old style with _nczarr_xxx in obj not attributes */
}
if(jncxxxp) *jncxxxp = jxxx;
done:

12
nc_test/Makefile.am
View File

@ -126,13 +126,13 @@ tst_http_nc3.cdl tst_http_nc4?.cdl tmp*.cdl tmp*.nc
EXTRA_DIST += bad_cdf5_begin.nc run_cdf5.sh nc_enddef.cdl
if NETCDF_ENABLE_CDF5
# bad_cdf5_begin.nc is a corrupted CDF-5 file with bad variable starting
# file offsets. It is to be used by tst_open_cdf5.c to check if it can
# detect and report error code NC_ENOTNC.
TESTS += run_cdf5.sh
check_PROGRAMS += tst_open_cdf5
# bad_cdf5_begin.nc is a corrupted CDF-5 file with bad variable starting
# file offsets. It is to be used by tst_open_cdf5.c to check if it can
# detect and report error code NC_ENOTNC.
TESTS += run_cdf5.sh
check_PROGRAMS += tst_open_cdf5
if LARGE_FILE_TESTS
TESTPROGRAMS += tst_large_cdf5 tst_cdf5_begin
TESTPROGRAMS += tst_large_cdf5 tst_cdf5_begin
endif
endif

12
ncdap_test/Makefile.am
View File

@ -60,15 +60,15 @@ TESTS += tst_hyrax.sh
TESTS += test_partvar
# Various
TESTS += tst_longremote3.sh
tst_longremote3.log: tst_remote3.log
TESTS += tst_longremote3.sh
tst_longremote3.log: tst_remote3.log
endif
if NETCDF_ENABLE_DAP_LONG_TESTS
test_manyurls_SOURCES = test_manyurls.c manyurls.h
check_PROGRAMS += test_manyurls
test_manyurls.log: tst_longremote3.log
TESTS += test_manyurls
test_manyurls_SOURCES = test_manyurls.c manyurls.h
check_PROGRAMS += test_manyurls
test_manyurls.log: tst_longremote3.log
TESTS += test_manyurls
endif
test_partvar_SOURCES = test_partvar.c

6
nczarr_test/Makefile.am
View File

@ -96,8 +96,8 @@ TESTS += run_unlim_io.sh run_nccopyz.sh
endif
if LARGE_FILE_TESTS
check_PROGRAMS += test_writecaching test_readcaching
TESTS += run_cachetest.sh
check_PROGRAMS += test_writecaching test_readcaching
TESTS += run_cachetest.sh
endif
endif #NETCDF_BUILD_UTILITIES
@ -105,7 +105,7 @@ endif #NETCDF_BUILD_UTILITIES
if NETCDF_BUILD_UTILITIES
if NETCDF_ENABLE_NCZARR_ZIP
TESTS += run_newformat.sh
TESTS += run_newformat.sh
endif
if LARGE_FILE_TESTS

BIN
nczarr_test/ref_oldformat.zip
View File

Binary file not shown.