From 7eff7deca464bcf195f0b37a1f0dba1786d1a19b Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Thu, 30 Nov 2023 11:14:10 -0700 Subject: [PATCH 1/2] Check for either the old default cache nelems value, or the new one introduced in netcdf-c commit #f1a3a64 --- nf_test4/ftst_vars.F | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nf_test4/ftst_vars.F b/nf_test4/ftst_vars.F index fe8d9599..f8d6aa25 100644 --- a/nf_test4/ftst_vars.F +++ b/nf_test4/ftst_vars.F @@ -35,10 +35,12 @@ program ftst_vars integer endianness C Cache size stuff. - integer DEFAULT_CACHE_SIZE, DEFAULT_CACHE_NELEMS + integer DEFAULT_CACHE_SIZE, DEFAULT_CACHE_NELEMS_OLD + integer DEFAULT_CACHE_NELEMS_NEW integer DEFAULT_CACHE_PREEMPTION parameter (DEFAULT_CACHE_SIZE = 16777216) - parameter (DEFAULT_CACHE_NELEMS = 4133) + parameter (DEFAULT_CACHE_NELEMS_OLD = 4133) + parameter (DEFAULT_CACHE_NELEMS_NEW = 1000) parameter (DEFAULT_CACHE_PREEMPTION = 75) integer CACHE_SIZE, CACHE_NELEMS, CACHE_PREEMPTION parameter (CACHE_SIZE = 8000, CACHE_NELEMS = 500) @@ -63,7 +65,8 @@ program ftst_vars & cache_preemption_in) if (retval .ne. nf_noerr) stop 1 if (cache_size_in .ne. DEFAULT_CACHE_SIZE .or. - & cache_nelems_in .ne. DEFAULT_CACHE_NELEMS .or. + & (cache_nelems_in .ne. DEFAULT_CACHE_NELEMS_OLD .and. + & cache_nelems_in .ne. DEFAULT_CACHE_NELEMS_NEW) .or. & cache_preemption_in .ne. DEFAULT_CACHE_PREEMPTION) stop 4 C Change the cache size for the files created/opened in this program. From 14514ecfff26fd221164938a96f43bb2975b7788 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Thu, 30 Nov 2023 11:16:50 -0700 Subject: [PATCH 2/2] Add 'main' back into the github CI --- .github/workflows/run_tests_linux.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run_tests_linux.yml b/.github/workflows/run_tests_linux.yml index 75c3d64a..19a22813 100644 --- a/.github/workflows/run_tests_linux.yml +++ b/.github/workflows/run_tests_linux.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: hdf5: [ 1.12.2 ] - netcdf: [ v4.7.4, v4.8.1, v4.9.0 ] + netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ] steps: @@ -75,7 +75,7 @@ jobs: strategy: matrix: hdf5: [ 1.12.2 ] - netcdf: [ v4.7.4, v4.8.1, v4.9.0 ] + netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ] steps: @@ -134,7 +134,7 @@ jobs: strategy: matrix: hdf5: [ 1.12.2 ] - netcdf: [ v4.7.4, v4.8.1, v4.9.0 ] + netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ] steps: @@ -231,7 +231,7 @@ jobs: strategy: matrix: hdf5: [ 1.12.2 ] - netcdf: [ v4.7.4, v4.8.1, v4.9.0 ] + netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ] steps: @@ -329,7 +329,7 @@ jobs: strategy: matrix: hdf5: [ 1.12.2 ] - netcdf: [ v4.7.4, v4.8.1, v4.9.0 ] + netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ] steps: