Skip to content

Commit 7eff7de

Browse files
committed
Check for either the old default cache nelems value, or the new one introduced in netcdf-c commit #f1a3a64
1 parent 155d387 commit 7eff7de

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

nf_test4/ftst_vars.F

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ program ftst_vars
3535
integer endianness
3636

3737
C Cache size stuff.
38-
integer DEFAULT_CACHE_SIZE, DEFAULT_CACHE_NELEMS
38+
integer DEFAULT_CACHE_SIZE, DEFAULT_CACHE_NELEMS_OLD
39+
integer DEFAULT_CACHE_NELEMS_NEW
3940
integer DEFAULT_CACHE_PREEMPTION
4041
parameter (DEFAULT_CACHE_SIZE = 16777216)
41-
parameter (DEFAULT_CACHE_NELEMS = 4133)
42+
parameter (DEFAULT_CACHE_NELEMS_OLD = 4133)
43+
parameter (DEFAULT_CACHE_NELEMS_NEW = 1000)
4244
parameter (DEFAULT_CACHE_PREEMPTION = 75)
4345
integer CACHE_SIZE, CACHE_NELEMS, CACHE_PREEMPTION
4446
parameter (CACHE_SIZE = 8000, CACHE_NELEMS = 500)
@@ -63,7 +65,8 @@ program ftst_vars
6365
& cache_preemption_in)
6466
if (retval .ne. nf_noerr) stop 1
6567
if (cache_size_in .ne. DEFAULT_CACHE_SIZE .or.
66-
& cache_nelems_in .ne. DEFAULT_CACHE_NELEMS .or.
68+
& (cache_nelems_in .ne. DEFAULT_CACHE_NELEMS_OLD .and.
69+
& cache_nelems_in .ne. DEFAULT_CACHE_NELEMS_NEW) .or.
6770
& cache_preemption_in .ne. DEFAULT_CACHE_PREEMPTION) stop 4
6871

6972
C Change the cache size for the files created/opened in this program.

0 commit comments

Comments
 (0)