CMakeLists.txt

@@ -22,7 +22,9 @@ endif()
 # enable default internal libs
 option(CDI_LIBGRIB "GRIB support [default=ON]" ON)
 if(${CDI_LIBGRIB})
-  list(APPEND cdi_compile_defs HAVE_LIBGRIB=1)
+  list(APPEND cdi_compile_defs
+       HAVE_LIBGRIB=1
+       HAVE_LIBGRIB_API=1)
 endif()
 
 option(CDI_LIBGRIBEX "Use the CGRIBEX library [default=ON]" ON)
@@ -50,8 +52,6 @@ option(CDI_ECCODES "Use the eccodes library [default=ON]" ON)
 if(${CDI_ECCODES} OR eccodes_ROOT)
   find_package(eccodes)
   if (${eccodes_FOUND})
-    list(APPEND cdi_compile_defs HAVE_LIBGRIB_API=${eccodes_FOUND})
-    message(VERBOSE "added compile definition HAVE_LIBGRIB_API=${eccodes_FOUND}")
     list(APPEND cdi_linked_libs eccodes)
   else()
     message(WARNING "eccodes not found, compiling without eccodes")
@@ -67,8 +67,6 @@ if(${CDI_NETCDF} OR netCDF_ROOT )
       HAVE_LIBNETCDF=${netCDF_FOUND}
       HAVE_LIBNC_DAP=${netCDF_FOUND}
       HAVE_NETCDF4=${netCDF_FOUND}
-      HAVE_LIBGRIB_API=${netCDF_FOUND}
-      HAVE_LIBGRIB=${netCDF_FOUND}
     )
     list(APPEND cdi_linked_libs netCDF::netcdf)
   else()

ChangeLog

-2025-02-28  Uwe Schulzweida
+2025-03-05  Uwe Schulzweida
 
 	* Version 2.5.1 released
 

NEWS

 CDI NEWS
 --------
 
+Version 2.5.1 (05 Mar 2025):
+
+   Changes:
+     * NetCDF4: improved calculation of output chunk size
+     * NetCDF4: improved calculation of input chunk cache size for numStep>1 and zSize>1
+
 Version 2.5.0 (28 Nov 2024):
 
    Changes:

configure.ac

@@ -7,7 +7,7 @@
 AC_PREREQ([2.69])
 LT_PREREQ([2.4.6])
 
-AC_INIT([cdi],[2.5.1],[https://mpimet.mpg.de/cdi])
+AC_INIT([cdi],[2.5.1.1],[https://mpimet.mpg.de/cdi])
 AC_DEFINE_UNQUOTED(CDI, ["$PACKAGE_VERSION"], [CDI version])
 
 AC_CONFIG_AUX_DIR([config])

src/cdi.h

@@ -1450,8 +1450,8 @@ extern int (*proj_stere_to_lonlat_func)(struct CDI_GridProjParams gpp, double, d
 // Used on CDO remap_scrip_io.cc
 void cdf_def_var_filter(int ncid, int ncvarID, const char *filterSpec);
 
-int cdi_has_dap();
-int cdi_has_cgribex();
+int cdi_has_dap(void);
+int cdi_has_cgribex(void);
 
 #ifdef __cplusplus
 }

src/cdi_int.c

@@ -591,7 +591,7 @@ stream_def_accesstype(stream_t *s, int type)
 }
 
 int
-cdi_has_dap()
+cdi_has_dap(void)
 {
 #ifdef HAVE_LIBNC_DAP
   return 1;
@@ -600,7 +600,7 @@ cdi_has_dap()
 }
 
 int
-cdi_has_cgribex()
+cdi_has_cgribex(void)
 {
 #ifdef HAVE_LIBCGRIBEX
   return 1;