diff --git a/.github/workflows/Intel.yml b/.github/workflows/Intel.yml index 57a6014..bb53d7a 100644 --- a/.github/workflows/Intel.yml +++ b/.github/workflows/Intel.yml @@ -35,7 +35,7 @@ jobs: rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list sudo apt-get update - sudo apt-get install intel-oneapi-dev-utilities intel-oneapi-mpi-devel intel-oneapi-openmp intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic + sudo apt-get install intel-oneapi-dev-utilities intel-oneapi-mpi-devel intel-oneapi-openmp intel-oneapi-compiler-fortran-2023.2.1 intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-2023.2.1 echo "source /opt/intel/oneapi/setvars.sh" >> ~/.bash_profile - name: cache-bacio diff --git a/ush/err_exit b/ush/err_exit index 01a602c..e3ffeb0 100755 --- a/ush/err_exit +++ b/ush/err_exit @@ -58,8 +58,12 @@ if [ "$SENDECF" = "YES" ]; then fi # KILL THE JOB: -if [ -z $PBS_JOBID ]; then -ecflow_client --kill=${ECF_NAME:?} -else -qdel $PBS_JOBID +if [ "$SENDECF" = "YES" ]; then + ecflow_client --kill=${ECF_NAME:?} +fi + +if [ ! -z $PBS_JOBID ]; then + qdel $PBS_JOBID +elif [ ! -z $SLURM_JOB_ID ]; then + scancel $SLURM_JOB_ID fi