Merge pull request #421 from WardF/fix_ftst_vars.F

Check for either the old or new default values in ftst_vars.F
Unidata · Nov 30, 2023 · c792395 · c792395
2 parents b019292 + c9aa5ee
commit c792395
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git 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:
 

diff --git 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.