Merge branch 'm214003/develop' of gitlab.dkrz.de:mpim-sw/cdo into m214003/develop

config/default

@@ -355,6 +355,7 @@ case "${HOSTNAME}" in
 	;;
 # levante
     levante*)
+        INTELONEAPI=/sw/spack-levante/intel-oneapi-compilers-2022.0.1-an2cbq/compiler/2022.0.1/linux
         NETCDFPATH=/sw/spack-levante/netcdf-c-4.8.1-qk24yp
         HDF5PATH=/sw/spack-levante/hdf5-1.12.1-akf2kp
         UDUNITS2PATH=/sw/spack-levante/udunits-2.2.28-da6pla
@@ -362,7 +363,7 @@ case "${HOSTNAME}" in
         ECCODESPATH=/sw/spack-levante/eccodes-2.21.0-4ywkk4
         MAGICSPATH=/sw/spack-levante/magics-4.9.3-z64bdu
         SZPATH=/sw/spack-levante/libaec-1.0.5-r5sdw5
-        PROJPATH=/sw/spack-levante/proj-8.1.0-i6a6ah
+        #PROJPATH=/sw/spack-levante/proj-8.1.0-i6a6ah
         CDOLIBS="--with-eccodes=$ECCODESPATH \
                  --with-netcdf=$NETCDFPATH \
                  --with-hdf5=$HDF5PATH \
@@ -371,24 +372,26 @@ case "${HOSTNAME}" in
                  --with-szlib=$SZPATH \
                  --with-curl \
                  --with-ossp-uuid \
-                 --with-libxml2 \
-                 --with-proj=$PROJPATH \
-                 --with-magics=$MAGICSPATH"
-        LDFLAGS="-L$ECCODESPATH/lib64 -Wl,-rpath,$ECCODESPATH/lib64 -L$MAGICSPATH/lib64 -Wl,-rpath,$MAGICSPATH/lib64"
+                 --with-libxml2"
+        #        --with-proj=$PROJPATH"
+        #         --with-magics=$MAGICSPATH"
+        # 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 -Wl,-rpath,$HDF5PATH/lib"
         LDFLAGS="$LDFLAGS -Wl,-rpath,$UDUNITS2PATH/lib"
-        LDFLAGS="$LDFLAGS -Wl,-rpath,$PROJPATH/lib"
+        # LDFLAGS="$LDFLAGS -Wl,-rpath,$PROJPATH/lib"
+        LDFLAGS="$LDFLAGS -Wl,-rpath,$INTELONEAPI/compiler/lib/intel64"
         LDFLAGS="$LDFLAGS -L$FFTW3PATH/lib -Wl,-rpath,$FFTW3PATH/lib"
 
         if  test "$COMP" = intel ; then
           ${CONFPATH}configure --prefix=$HOME/local \
                     $CDOLIBS \
                     LDFLAGS="$LDFLAGS" \
-                    F77=ifort FFLAGS="-g -O2" \
-	            CXX=icpc CXXFLAGS="-g -Wall -O2 -march=core-avx2 -I${FFTW3PATH}/include" \
-	            CC=icc   CFLAGS="-g -Wall -O2 -march=core-avx2"
+                    F77=ifx FFLAGS="-g -O2" \
+	            CXX=icpx CXXFLAGS="-g -Wall -O2 -march=core-avx2 -I${FFTW3PATH}/include" \
+	            CC=icx   CFLAGS="-g -Wall -O2 -march=core-avx2"
         elif  test "$COMP" = pgi ; then
           ${CONFPATH}configure --without-fortran \
                     $CDOLIBS \