From c31ee055647d7d5b4cd730d0995c109c1912ab23 Mon Sep 17 00:00:00 2001
From: Anne Tipka <anne.tipka@ctbto.org>
Date: Thu, 20 Oct 2022 20:37:03 +0000
Subject: [PATCH] added loading of ecaccess module in submit script and
 adjusted installscript to Bologna environment

---
 Templates/installscript.template.bologna | 15 ++++++++-------
 setup_bologna.sh                         |  4 ++--
 setup_local_bologna.sh                   |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Templates/installscript.template.bologna b/Templates/installscript.template.bologna
index 13c9b88..405abf4 100644
--- a/Templates/installscript.template.bologna
+++ b/Templates/installscript.template.bologna
@@ -1,16 +1,15 @@
-#!/bin/ksh
+#!/bin/bash
 
 # ON ECS or HPC servers:
 # start with ecaccess-job-submit -queueName <QUEUENAME> <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 --job-name=flex_compile
+#SBATCH --output=flex_compile.%j.out
+#SBATCH --error=flex_compile.%j.out
 #SBATCH --mail-type=FAIL
-#SBATCH --mail-user=$username
 
 ## CRAY specific batch requests
 ##PBS -N flex_ecmwf
@@ -58,10 +57,12 @@ make -f $${MAKEFILE} >flexcompile 2>flexcompile
 
 ls -l $fortran_program >>flexcompile
 if [ $$? -eq 0 ]; then
-  echo 'SUCCESS!' >>flexcompile
+  echo -e '\nSUCCESS!' >>flexcompile
   mail -s flexcompile.$${HOST}.$$$$ $${USER} <flexcompile
+  sleep 1
 else
   echo Environment: >>flexcompile
   env >> flexcompile
   mail -s "ERROR! flexcompile.$${HOST}.$$$$" $${USER} <flexcompile
+  sleep 1
 fi
diff --git a/setup_bologna.sh b/setup_bologna.sh
index b7d5e50..86ea0f1 100755
--- a/setup_bologna.sh
+++ b/setup_bologna.sh
@@ -52,8 +52,8 @@ parameterlist=""
 
 # CHECK IF ON ECMWF SERVER; 
 if [[ $EC_CLUSTER == "ecs" ]] || [[ $EC_CLUSTER == "aa"* ]] || [[ $EC_CLUSTER == "ab"* ]] || [[ $EC_CLUSTER == "ac"* ]] || [[ $EC_CLUSTER == "ad"* ]]; then
-# LOAD PYTHON3 MODULE
-  module load python3
+# LOAD PYTHON3 AND ECACCESS MODULES
+  module load python3 ecaccess
 fi 
 
 # DEFAULT PARAMETERLIST
diff --git a/setup_local_bologna.sh b/setup_local_bologna.sh
index 3d9f122..9784f78 100755
--- a/setup_local_bologna.sh
+++ b/setup_local_bologna.sh
@@ -56,8 +56,8 @@ parameterlist=""
 
 # CHECK IF ON ECMWF SERVER; 0
 if [[ $EC_CLUSTER == "ecs" ]] || [[ $EC_CLUSTER == "aa"* ]] || [[ $EC_CLUSTER == "ac"* ]] || [[ $EC_CLUSTER == "ad"* ]] || [[ $EC_CLUSTER == "ab"* ]]; then
-# LOAD PYTHON3 MODULE
-  module load python3
+# LOAD PYTHON3 AND ECACCESS MODULES
+  module load python3 ecaccess
 fi 
 
 # DEFAULT PARAMETERLIST
-- 
GitLab