From 17dc83adc098f02c9b708cfefba9e838365e816c Mon Sep 17 00:00:00 2001
From: Anne Tipka <anne.tipka@ctbto.org>
Date: Thu, 20 Oct 2022 22:46:11 +0000
Subject: [PATCH] switched to Bologna jobscript and adapted jobscript to
 Bologna environment

---
 Templates/jobscript.template         | 2 +-
 Templates/jobscript.template.bologna | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Templates/jobscript.template b/Templates/jobscript.template
index d83deb3..8c11a1e 120000
--- a/Templates/jobscript.template
+++ b/Templates/jobscript.template
@@ -1 +1 @@
-jobscript.template.reading
\ No newline at end of file
+jobscript.template.bologna
\ No newline at end of file
diff --git a/Templates/jobscript.template.bologna b/Templates/jobscript.template.bologna
index 8e61337..7635bef 100644
--- a/Templates/jobscript.template.bologna
+++ b/Templates/jobscript.template.bologna
@@ -1,16 +1,15 @@
-#!/bin/ksh
+#!/bin/bash
 
 # ON ECS or HPC:
 # start with ecaccess-job-submit -queueName <QUEUE_NAME> <NAME_OF_THIS_FILE>  on gateway server
 # start with srun <NAME_OF_THIS_FILE> directly on machine
 
-#SBATCH --chdir=$$$$SCRATCH
+#SBATCH --chdir=/scratch/$username
 #SBATCH --qos=el
 #SBATCH --job-name=flex_extract
 #SBATCH --output=flex_extract.%j.out
-#SBATCH --error=flex_error.%j.out
+#SBATCH --error=flex_extract.%j.out
 #SBATCH --mail-type=FAIL
-#SBATCH --mail-user=$username
 #SBATCH --time=24:00:00
 
 ## CRAY specific batch requests
@@ -61,6 +60,7 @@ if [ $? -eq 0 ] ; then
   for muser in `grep -i MAILOPS $$$${CONTROL}`; do
       if [ $$$${l} -gt 0 ] ; then 
          mail -s flex.$$$${HOST}.$$$$$$$$ $$$${muser} <prot
+         sleep 1
       fi
       l=$(($$$${l}+1))
   done
@@ -69,6 +69,7 @@ else
   for muser in `grep -i MAILFAIL $$$${CONTROL}`; do
       if [ $$$${l} -gt 0 ] ; then 
          mail -s "ERROR! flex.$$$${HOST}.$$$$$$$$" $$$${muser} <prot
+         sleep 1
       fi
       l=$(($$$${l}+1))
   done
-- 
GitLab