more updates for netcdf-c/4.9.3

NCAR · Feb 13, 2025 · 303a848 · 303a848
1 parent 66a0582
commit 303a848
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/clib/pio_nc4.c b/src/clib/pio_nc4.c
@@ -1308,7 +1308,6 @@ PIOc_get_var_chunk_cache(int ncid, int varid, PIO_Offset *sizep, PIO_Offset *nel
 }
 /* use this variable in the NETCDF library (introduced in v4.9.0) to determine if the following
    functions are available */
-#ifdef NC_HAS_MULTIFILTERS
 /**
  * Set the variable filter ids
  *
@@ -1878,8 +1877,6 @@ PIOc_inq_filter_avail(int ncid, unsigned int id )
 }
 // PIO_HAS_PAR_FILTERS
 #endif 
-// NC_HAS_MULTIFILTERS
-#endif
 #ifdef NC_HAS_QUANTIZE
 /**
  * Turn on quantization for a variable

diff --git a/src/clib/pioc_support.c b/src/clib/pioc_support.c
@@ -3111,7 +3111,8 @@ iotype_is_valid(int iotype)
         ret++;
 
     /* Some builds include netCDF-4. */
-#ifdef NC_HAS_NC4
+    /* as of netcdf 4.9.3 NC_HAS_NC4 is no longer defined */
+#if NC_HAS_NC4 || (NC_VERSION_PATCH > 2)
     if (iotype == PIO_IOTYPE_NETCDF4C || iotype == PIO_IOTYPE_NETCDF4P)
         ret++;
 #endif /* _NETCDF4 */

diff --git a/src/flib/pio_nf.F90 b/src/flib/pio_nf.F90
@@ -140,7 +140,7 @@ module pio_nf
        pio_def_var_quantize                                 , &
        pio_inq_var_quantize                                 , &
 #endif
-#ifdef NC_HAS_MULTIFILTERS
+!!#ifdef NC_HAS_MULTIFILTERS
 #ifdef NC_HAS_BZ
        pio_inq_var_bzip2                                    , &
        pio_def_var_bzip2                                    , &
@@ -154,7 +154,7 @@ module pio_nf
        pio_inq_var_filter_info                              , &
        pio_inq_filter_avail                                 , &
 #endif
-#endif
+!!#endif
        pio_set_fill
   !       pio_copy_att    to be done