From 6c5bc765932de0c634ee7c915424281d1f4c0a86 Mon Sep 17 00:00:00 2001 From: Uwe Schulzweida <uwe.schulzweida@mpimet.mpg.de> Date: Wed, 5 Mar 2025 13:56:26 +0100 Subject: [PATCH] config/default: use netcdf-c-4.9.3 on levante --- config/default | 7 ++----- src/cdo_def_options.cc | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/config/default b/config/default index 9a1134d11..b98fb1231 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/src/cdo_def_options.cc b/src/cdo_def_options.cc index 4beee3b7f..00b992d08 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; -- GitLab