diff --git a/ChangeLog b/ChangeLog index b4cd3f0981f71ba1f5705ec2843da8e527009f09..2d0b7415e6496ded62cd746b01af298932100c92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2025-03-12 Uwe Schulzweida +2025-03-05 Uwe Schulzweida * Using CDI library version 2.5.1 * Using YAC version 3.4.0 diff --git a/NEWS b/NEWS index 215c411b12db8739dbf870f1d09243c64332d5a4..ef15a1a5af3d8ca14f91b57a068f6072fb7f7b77 100644 --- a/NEWS +++ b/NEWS @@ -3,11 +3,18 @@ CDO NEWS Improvement -Version 2.5.1 (6 Feb 2025): + New features: + * option --chunkspec to define chunkSize of t and z dimension + New operators: + * air_density + * setchunkspec - Specify chunking + +Version 2.5.1 (5 Mar 2025): New operators: * cinfo: Compact information listed by parameter name Fixed bugs: + * detrend: failed if missing_value is between 0 and numSteps * remapcon: env.var. REMAP_AREA_MIN failed since release 2.4.0 * consects/consecsum: wrong result since release 2.4.0 [Bug #12030] @@ -17,7 +24,6 @@ Version 2.5.0 (28 Nov 2024): * Added support for non-thread-safe NetCDF4/HDF5 library * Remapstat: added support for unstructured target grids * Timselstat: added support for parameter nskip=-1 - New operators: Fixed bugs: * diff: added check for NANs [Bug #11963] * setpartabn: convert parameter failed diff --git a/config/default b/config/default index 9a1134d119731d0470e6c3279f01372097f4f1e5..b98fb1231f17ba9f57c5bfca7071a84c26a5886d 100755 --- a/config/default +++ b/config/default @@ -369,10 +369,7 @@ case "${HOSTNAME}" in # NETCDFPATH=/sw/spack-levante/netcdf-c-4.8.1-qk24yp # HDF5PATH=/sw/spack-levante/hdf5-1.12.1-akf2kp levante*) - #NETCDFPATH=/sw/spack-levante/netcdf-c-4.8.1-qk24yp - #HDF5PATH=/sw/spack-levante/hdf5-1.12.1-akf2kp - NETCDFPATH=/sw/spack-levante/netcdf-c-4.9.2-ytsqvg - HDF5PATH=/sw/spack-levante/hdf5-1.14.0-h4ty2w + NETCDFPATH=/sw/spack-levante/netcdf-c-4.9.3-dp4zi4 UDUNITS2PATH=/sw/spack-levante/udunits-2.2.28-da6pla FFTW3PATH=/sw/spack-levante/fftw-3.3.10-fnfhvr ECCODESPATH=/sw/spack-levante/eccodes-2.32.5-ly6tko @@ -393,7 +390,7 @@ case "${HOSTNAME}" in # LDFLAGS="-L$MAGICSPATH/lib64 -Wl,-rpath,$MAGICSPATH/lib64" LDFLAGS="$LDFLAGS -L$ECCODESPATH/lib64 -Wl,-rpath,$ECCODESPATH/lib64" LDFLAGS="$LDFLAGS -L$SZPATH/lib64 -Wl,-rpath,$SZPATH/lib64" - LDFLAGS="$LDFLAGS -Wl,-rpath,$NETCDFPATH/lib" + LDFLAGS="$LDFLAGS -L$NETCDFPATH/lib64 -Wl,-rpath,$NETCDFPATH/lib64" # LDFLAGS="$LDFLAGS -Wl,-rpath,/sw/spack-levante/hdf-4.2.16-2-h6elwi/lib" LDFLAGS="$LDFLAGS -Wl,-rpath,$HDF5PATH/lib" LDFLAGS="$LDFLAGS -Wl,-rpath,$UDUNITS2PATH/lib" diff --git a/libcdi b/libcdi index 8dbf0a5b3427ca421f488041bbfa032e2e4d21dd..b9a7b1f01600456c195ea4b1611098e0d39cdfe7 160000 --- a/libcdi +++ b/libcdi @@ -1 +1 @@ -Subproject commit 8dbf0a5b3427ca421f488041bbfa032e2e4d21dd +Subproject commit b9a7b1f01600456c195ea4b1611098e0d39cdfe7 diff --git a/src/Derivepar.cc b/src/Derivepar.cc index 609138c553e4bbff4b56102dd59248f106248b28..55737614755e1f00f9e53e5bc9c98d3367a1d52b 100644 --- a/src/Derivepar.cc +++ b/src/Derivepar.cc @@ -176,7 +176,7 @@ public: cdo_print("Found:"); // clang-format off if (-1 != varIDs.husID) cdo_print(" %s -> %s", var_stdname(specific_humidity), varList1.vars[varIDs.husID].name); - if (-1 != varIDs.taID) cdo_print(" %s -> %s", var_stdname(air_temperature), varList1.vars[varIDs.taID].name); + if (-1 != varIDs.taID) cdo_print(" %s -> %s", var_stdname(air_temperature), varList1.vars[varIDs.taID].name); if (-1 != varIDs.psID) cdo_print(" %s -> %s", var_stdname(surface_air_pressure), varList1.vars[varIDs.psID].name); if (-1 != varIDs.lnpsID) cdo_print(" LOG(%s) -> %s", var_stdname(surface_air_pressure), varList1.vars[varIDs.lnpsID].name); if (-1 != varIDs.sgeopotID) cdo_print(" %s -> %s", var_stdname(surface_geopotential), varList1.vars[varIDs.sgeopotID].name); diff --git a/src/cdo_def_options.cc b/src/cdo_def_options.cc index 4beee3b7f4279fc39ea935c68ce07f821b37ef34..00b992d0880aac260756eb6a004d93064325d53a 100644 --- a/src/cdo_def_options.cc +++ b/src/cdo_def_options.cc @@ -354,7 +354,7 @@ setup_options() ->set_category("Multi Threading") ->add_help("Set number of OpenMP threads."); - CLIOptions::option("p") + CLIOptions::option("async_read", "p") ->set_internal(true) ->add_effect([&]() { Options::CDO_Async_Read = true;