From 0164e0e3a09c0791ce86518019cb1490d774ede5 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 29 Jul 2022 11:15:02 -0600 Subject: [PATCH 1/5] Explicitly populate value_grid_xt_loc in parallel test, in support of https://github.com/Unidata/netcdf-fortran/issues/376 --- nf03_test4/f90tst_parallel_compressed.F90 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nf03_test4/f90tst_parallel_compressed.F90 b/nf03_test4/f90tst_parallel_compressed.F90 index 60c0da45..c2f65693 100644 --- a/nf03_test4/f90tst_parallel_compressed.F90 +++ b/nf03_test4/f90tst_parallel_compressed.F90 @@ -145,6 +145,9 @@ program f90tst_parallel_compressed allocate(value_clwmr_loc_in(lat_xt_loc_size, lat_yt_loc_size, pfull_loc_size, 1)) ! Some fake data for this pe to write. + do i = 1, grid_xt_loc_size + value_grid_xt_loc(i) = i; + end do do i = 1, pfull_loc_size value_pfull_loc(i) = my_rank * 100 + i; end do From ce198aa844b62dd1a83d3f4471b78d037fba9b14 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 29 Jul 2022 11:25:12 -0600 Subject: [PATCH 2/5] Update header w/ details, modify date of release in RELEASE_NOTES --- RELEASE_NOTES.md | 2 +- nf03_test4/f90tst_parallel_compressed.F90 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index cad4ff9d..a8d540d2 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -14,7 +14,7 @@ Entries are in reverse chronological order (most recent first). ### Other Changes -## 4.6.0 - July 27, 2022 +## 4.6.0 - July 29, 2022 ### Requirements diff --git a/nf03_test4/f90tst_parallel_compressed.F90 b/nf03_test4/f90tst_parallel_compressed.F90 index c2f65693..b7d1f2b4 100644 --- a/nf03_test4/f90tst_parallel_compressed.F90 +++ b/nf03_test4/f90tst_parallel_compressed.F90 @@ -9,6 +9,8 @@ ! https://github.com/NOAA-EMC/fv3atm/blob/develop/io/module_write_netcdf_parallel.F90 ! Ed Hartnett, 6/16/20 +! Ward Fisher, 7/29/22 - Explicity assign values to an array, avoiding a +! platform-specific failure. program f90tst_parallel_compressed use typeSizes From fc46f4d9b4b6643b97cb07d5bf56caa6c3ad22e7 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 29 Jul 2022 13:19:38 -0600 Subject: [PATCH 3/5] Update Release Notes. --- RELEASE_NOTES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index a8d540d2..386827a1 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -22,8 +22,8 @@ Entries are in reverse chronological order (most recent first). ### Notable Changes -* Introduction of Quantize functionality (this description line is a placeholder) -* Plugin Support (this description line is a placeholder) +* We've added API support to take advantage of the Quantize functionality provided by libnetcdf 4.9.0+. [See this conversation](https://github.com/Unidata/netcdf-c/issues/1548) for more information. +* We've added API support to take advantage of ZStandard compression functionality, [as described here](https://github.com/Unidata/netcdf-c/issues/2173). Note that you can suppress this with the new options `--disable-zstandard-plugin` (for `configure`) and `-DDISABLE_ZSTANDARD_PLUGIN` (for `cmake`). ### Other Changes * Will be generated via GitHub automation. From 876ca13213382854ce11ce9654f6ab964b30b14f Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 29 Jul 2022 13:25:43 -0600 Subject: [PATCH 4/5] Add execute bit to parallel test in cmake-based builds. --- nf03_test4/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nf03_test4/CMakeLists.txt b/nf03_test4/CMakeLists.txt index b1bfbc39..d968241e 100644 --- a/nf03_test4/CMakeLists.txt +++ b/nf03_test4/CMakeLists.txt @@ -39,7 +39,9 @@ if (USE_NETCDF4) CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/run_f90_par_test.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/run_f90_par_test.sh" @ONLY) - FILE(COPY "${CMAKE_CURRENT_SOURCE_DIR}/run_f90_par_test.sh" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) + FILE(COPY "${CMAKE_CURRENT_SOURCE_DIR}/run_f90_par_test.sh" + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ + FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) build_bin_test(f90tst_parallel ".F90") From 2bd24a4b4b875a318ec068a9e25585b1fd65cb40 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 29 Jul 2022 13:35:09 -0600 Subject: [PATCH 5/5] Updated Release Notes with full changelog in addition to highlighting Quantize and ZStandard support. --- RELEASE_NOTES.md | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 386827a1..2403d5b8 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -26,7 +26,39 @@ Entries are in reverse chronological order (most recent first). * We've added API support to take advantage of ZStandard compression functionality, [as described here](https://github.com/Unidata/netcdf-c/issues/2173). Note that you can suppress this with the new options `--disable-zstandard-plugin` (for `configure`) and `-DDISABLE_ZSTANDARD_PLUGIN` (for `cmake`). ### Other Changes -* Will be generated via GitHub automation. +* Merge 4.5.4 changes back upstream by @WardF in https://github.com/Unidata/netcdf-fortran/pull/319 +* Fix error in cmake-generated nf-config by @WardF in https://github.com/Unidata/netcdf-fortran/pull/322 +* Wire in new tests in to PR #294 by @WardF in https://github.com/Unidata/netcdf-fortran/pull/325 +* Update of netcdf f90 get interface to handle arrays with total size >… by @m214089 in https://github.com/Unidata/netcdf-fortran/pull/294 +* Rationalize CMake minimum version to 3.12 by @scivision in https://github.com/Unidata/netcdf-fortran/pull/323 +* Fix hdf5 version mismatch. by @WardF in https://github.com/Unidata/netcdf-fortran/pull/331 +* adding v2 api test by @WardF in https://github.com/Unidata/netcdf-fortran/pull/332 +* adding v2 api test by @edwardhartnett in https://github.com/Unidata/netcdf-fortran/pull/330 +* set 'CMAKE_POSITION_INDEPENDENT_CODE ON' for shared lib by @MuellerSeb in https://github.com/Unidata/netcdf-fortran/pull/334 +* bug fix: when all parallel features are disabled in netcdf-c by @wkliao in https://github.com/Unidata/netcdf-fortran/pull/352 +* Updating github actions. by @WardF in https://github.com/Unidata/netcdf-fortran/pull/362 +* Untangle conflicts caused by PR merge/reversions by @WardF in https://github.com/Unidata/netcdf-fortran/pull/324 +* Gh318.wif by @WardF in https://github.com/Unidata/netcdf-fortran/pull/364 +* "Add quantize feature to F77 and F90 APIs, with tests and documentation" by @WardF in https://github.com/Unidata/netcdf-fortran/pull/318 +* convert to F90 and F by @edwardhartnett in https://github.com/Unidata/netcdf-fortran/pull/365 +* Fix f90tst_parallel_compressed.F90 extension in CMake builds by @ArchangeGabriel in https://github.com/Unidata/netcdf-fortran/pull/339 +* protect quantize code with preprocessor directives by @edwardhartnett in https://github.com/Unidata/netcdf-fortran/pull/366 +* initialize value_grid_yt_loc to zeros by @wkliao in https://github.com/Unidata/netcdf-fortran/pull/357 +* CI improvements: don't try to cache netcdf-c main build, add parallel I/O testing, and add testing with HDF5-1.12.2 by @edwardhartnett in https://github.com/Unidata/netcdf-fortran/pull/351 +* fix warning of status may be used uninitialized by @wkliao in https://github.com/Unidata/netcdf-fortran/pull/356 +* check if netcdf4 is enabled in netcdf-c by @wkliao in https://github.com/Unidata/netcdf-fortran/pull/353 +* Github 292 by @WardF in https://github.com/Unidata/netcdf-fortran/pull/368 +* Update nf_fortv2.90 by @LeonABenjamin in https://github.com/Unidata/netcdf-fortran/pull/292 +* CMake build: fix handling of run_f90_par_test.sh by @ArchangeGabriel in https://github.com/Unidata/netcdf-fortran/pull/341 +* Add support for zstandard compression by @edwardhartnett in https://github.com/Unidata/netcdf-fortran/pull/367 +* HDF5_PLUGIN_DIR verbosity by @WardF in https://github.com/Unidata/netcdf-fortran/pull/372 + +## New Contributors +* @m214089 made their first contribution in https://github.com/Unidata/netcdf-fortran/pull/294 +* @scivision made their first contribution in https://github.com/Unidata/netcdf-fortran/pull/323 +* @MuellerSeb made their first contribution in https://github.com/Unidata/netcdf-fortran/pull/334 +* @ArchangeGabriel made their first contribution in https://github.com/Unidata/netcdf-fortran/pull/339 +* @LeonABenjamin made their first contribution in https://github.com/Unidata/netcdf-fortran/pull/292 ## 4.5.4 - January 7, 2022