Simplify the MPI_LAUNCH logic in the CI scripts.

We need all this because the configure script accepts only absolute paths for MPI_LAUNCH.

.ci/bb/breeze-mpim/test.all.nv-21.3.0

@@ -19,7 +19,7 @@ init_nv2130
 --with-netcdf="${NETCDF_ROOT}" \
 CC="${MPICC}" \
 FC="${MPIFC}" \
-MPI_LAUNCH="$(which "${MPI_LAUNCH%% *}") ${MPI_LAUNCH#* }" \
+MPI_LAUNCH="${MPI_LAUNCH}" \
 PKG_CONFIG_PATH="${YAXT_ROOT}/lib/pkgconfig:${PPM_ROOT}/lib/pkgconfig"
 
 make -j8

.ci/bb/breeze-mpim/utils.sh

@@ -118,7 +118,7 @@ init_nv2130()
   FC=nvfortran
   MPICC=mpicc
   MPIFC=mpif90
-  MPI_LAUNCH='mpirun --mca mpi_cuda_support 0 --oversubscribe'
+  MPI_LAUNCH="$(which mpirun) --mca mpi_cuda_support 0 --oversubscribe"
 
   GRIBAPI_ROOT='/sw/stretch-x64/grib_api/grib_api-1.21.0-gccsys'
   NETCDF_ROOT='/sw/stretch-x64/netcdf/netcdf_c-4.6.1'

.ci/bb/daint-cscs/test.all.cray-11.0.0

@@ -32,7 +32,7 @@ CC="${CC}" \
 CPPFLAGS="${CPPFLAGS}" \
 FC="${FC}" \
 LDFLAGS="${LDFLAGS}" \
-MPI_LAUNCH="$(which "${MPI_LAUNCH%% *}") ${MPI_LAUNCH#* }" \
+MPI_LAUNCH="${MPI_LAUNCH}" \
 PKG_CONFIG_PATH="${YAXT_ROOT}/lib/pkgconfig:${PPM_ROOT}/lib/pkgconfig:${PKG_CONFIG_PATH}"
 
 make -j8

.ci/bb/daint-cscs/test.all.pgi-20.1.1

@@ -32,7 +32,7 @@ CC="${CC}" \
 CPPFLAGS="${CPPFLAGS}" \
 FC="${FC}" \
 LDFLAGS="${LDFLAGS}" \
-MPI_LAUNCH="$(which "${MPI_LAUNCH%% *}") ${MPI_LAUNCH#* }" \
+MPI_LAUNCH="${MPI_LAUNCH}" \
 PKG_CONFIG_PATH="${YAXT_ROOT}/lib/pkgconfig:${PPM_ROOT}/lib/pkgconfig:${PKG_CONFIG_PATH}"
 
 make -j8

.ci/bb/daint-cscs/utils.sh

@@ -108,7 +108,7 @@ init_cray1100()
   CC=cc
   CXX=CC
   FC=ftn
-  MPI_LAUNCH='srun -p cscsci -C gpu -A d56 -t 05:00'
+  MPI_LAUNCH="$(which srun) -p cscsci -C gpu -A d56 -t 05:00"
 
   ECCODES_ROOT='/scratch/snx3000/skosukhi/cdi-pio-sw/eccodes-20.20.0-cray11'
   PPM_ROOT='/scratch/snx3000/skosukhi/cdi-pio-sw/ppm-1.0.6-cray11'
@@ -130,7 +130,7 @@ init_pgi2011()
   CC=cc
   CXX=CC
   FC=ftn
-  MPI_LAUNCH='srun -p cscsci -C gpu -A d56 -t 05:00'
+  MPI_LAUNCH="$(which srun) -p cscsci -C gpu -A d56 -t 05:00"
 
   ECCODES_ROOT='/scratch/snx3000/skosukhi/cdi-pio-sw/eccodes-20.20.0-pgi20'
   PPM_ROOT='/scratch/snx3000/skosukhi/cdi-pio-sw/ppm-1.0.6-pgi20'

.ci/bb/mistral-dkrz/test.all.gcc-6.4.0

@@ -19,7 +19,7 @@ init_gcc640
 --with-netcdf="${NETCDF_ROOT}" \
 CC="${MPICC}" \
 FC="${MPIFC}" \
-MPI_LAUNCH="$(which "${MPI_LAUNCH%% *}") ${MPI_LAUNCH#* }" \
+MPI_LAUNCH="${MPI_LAUNCH}" \
 PKG_CONFIG_PATH="${YAXT_ROOT}/lib/pkgconfig:${PPM_ROOT}/lib/pkgconfig"
 
 make -j8

.ci/bb/mistral-dkrz/test.all.intel-17.0.6

@@ -19,7 +19,7 @@ init_intel1706
 --with-netcdf="${NETCDF_ROOT}" \
 CC="${MPICC}" \
 FC="${MPIFC}" \
-MPI_LAUNCH="$(which "${MPI_LAUNCH%% *}") ${MPI_LAUNCH#* }" \
+MPI_LAUNCH="${MPI_LAUNCH}" \
 PKG_CONFIG_PATH="${YAXT_ROOT}/lib/pkgconfig:${PPM_ROOT}/lib/pkgconfig"
 
 make -j8

.ci/bb/mistral-dkrz/test.all.nag-6.2.6223

@@ -26,7 +26,7 @@ FCFLAGS+=' -g -kind=byte'
 CC="${MPICC}" \
 FC="${MPIFC}" \
 FCFLAGS="${FCFLAGS}" \
-MPI_LAUNCH="$(which "${MPI_LAUNCH%% *}") ${MPI_LAUNCH#* }" \
+MPI_LAUNCH="${MPI_LAUNCH}" \
 PKG_CONFIG_PATH="${YAXT_ROOT}/lib/pkgconfig:${PPM_ROOT}/lib/pkgconfig"
 
 make -j8

.ci/bb/mistral-dkrz/test.all.pgi-19.9.0

@@ -35,7 +35,7 @@ CC="${MPICC}" \
 CPPFLAGS="${CPPFLAGS}" \
 FC="${MPIFC}" \
 LDFLAGS="${LDFLAGS}" \
-MPI_LAUNCH="$(which "${MPI_LAUNCH%% *}") ${MPI_LAUNCH#* }" \
+MPI_LAUNCH="${MPI_LAUNCH}" \
 PKG_CONFIG_PATH="${YAXT_ROOT}/lib/pkgconfig:${PPM_ROOT}/lib/pkgconfig"
 
 make -j8

.ci/bb/mistral-dkrz/test.icon-pio.nag-6.2.6223

@@ -65,7 +65,7 @@ MPI_C_INCLUDE= \
 MPI_C_LIB= \
 MPI_FC_LIB= \
 MPI_FC_MOD= \
-MPI_LAUNCH="$(which "${MPI_LAUNCH%% *}") ${MPI_LAUNCH#* }" \
+MPI_LAUNCH="${MPI_LAUNCH}" \
 PKG_CONFIG= \
 PPM_CORE_C_INCLUDE= \
 PPM_CORE_C_LIB= \

.ci/bb/mistral-dkrz/test.icon.gcc-6.4.0

@@ -44,7 +44,7 @@ MPI_C_INCLUDE= \
 MPI_C_LIB= \
 MPI_FC_LIB= \
 MPI_FC_MOD= \
-MPI_LAUNCH="$(which "${MPI_LAUNCH%% *}") ${MPI_LAUNCH#* }" \
+MPI_LAUNCH="${MPI_LAUNCH}" \
 PKG_CONFIG= \
 PPM_CORE_C_INCLUDE= \
 PPM_CORE_C_LIB= \

.ci/bb/mistral-dkrz/utils.sh

@@ -114,7 +114,7 @@ init_gcc640()
   FC=gfortran
   MPICC=mpicc
   MPIFC=mpif90
-  MPI_LAUNCH=mpirun
+  MPI_LAUNCH="$(which mpirun)"
 
   GRIBAPI_ROOT='/sw/rhel6-x64/grib_api/grib_api-1.15.0-gcc48'
   NETCDF_ROOT='/sw/rhel6-x64/netcdf/netcdf_c-4.4.0-parallel-openmpi2-gcc64'
@@ -135,7 +135,7 @@ init_intel1706()
   FC=ifort
   MPICC=mpicc
   MPIFC=mpif90
-  MPI_LAUNCH=mpirun
+  MPI_LAUNCH="$(which mpirun)"
 
   GRIBAPI_ROOT='/sw/rhel6-x64/grib_api/grib_api-1.15.0-gcc48'
   NETCDF_ROOT='/sw/rhel6-x64/netcdf/netcdf_c-4.4.0-parallel-openmpi2-intel14'
@@ -165,7 +165,7 @@ init_nag626223()
   FC=nagfor
   MPICC=mpicc
   MPIFC=mpif90
-  MPI_LAUNCH=mpirun
+  MPI_LAUNCH="$(which mpirun)"
 
   ECCODES_ROOT='/mnt/lustre01/work/k20200/sw/spack/opt/spack/linux-rhel6-x86_64/nag-6.2/eccodes-2.5.0-givay23bqhgzreuk5um2wtjsumebwbt4'
   NETCDF_ROOT='/mnt/lustre01/work/k20200/sw/spack/opt/spack/linux-rhel6-x86_64/gcc-8.3.0-works/netcdf-4.7.0-eftv5u36ogb5awbb27hffiiv5rib4kqj'
@@ -190,7 +190,7 @@ init_pgi1990()
   FC=pgfortran
   MPICC=mpicc
   MPIFC=mpif90
-  MPI_LAUNCH=orterun
+  MPI_LAUNCH="$(which orterun)"
 
   ECCODES_ROOT='/sw/spack-rhel6/eccodes-2.19.1-cqlkd7'
   NETCDF_ROOT='/sw/spack-rhel6/netcdf-c-4.7.4-22ody2'