From f7066da37c5fa982772c863271a24c74011c9be0 Mon Sep 17 00:00:00 2001
From: Peter Alexander <p.m.w.alexander@gmail.com>
Date: Sun, 11 Jun 2017 10:36:23 +0100
Subject: [PATCH] Cluster schedule scripts
---
scripts/createHindScenarios.sh | 12 +++++++++---
scripts/runCalibAndPlum.sh | 8 +++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/scripts/createHindScenarios.sh b/scripts/createHindScenarios.sh
index e8ec6394..3507479f 100755
--- a/scripts/createHindScenarios.sh
+++ b/scripts/createHindScenarios.sh
@@ -23,9 +23,15 @@ do
if [ -z "$header" ]; then
header=( "${array[@]}" )
else
- scenario="${array[0]}"
- scenario_dir=$output_dir/$scenario
- echo "$scenario in $scenario_dir"
+ ensemble="${array[0]}"
+ scenario="${array[1]}"
+ scenario_dir=$output_dir/$ensemble/$scenario
+ echo "$scenario for $ensemble in $scenario_dir"
+
+ if [ ! -d "$output_dir/$ensemble" ]; then
+ mkdir $output_dir/$ensemble
+ fi
+
if [ ! -d "$scenario_dir" ]; then
mkdir $scenario_dir
mkdir $scenario_dir/calib
diff --git a/scripts/runCalibAndPlum.sh b/scripts/runCalibAndPlum.sh
index 8f3b8f89..b157b8db 100755
--- a/scripts/runCalibAndPlum.sh
+++ b/scripts/runCalibAndPlum.sh
@@ -5,8 +5,10 @@ if [ $# -ne 1 ]; then
exit 0
fi
-jobName=${1//\/}c # remove slash from path as qsub doesnt allow it
+jobName=${1//\//_}c # remove slash from path as qsub doesnt allow it
+jobName=${jobName/hind1970/h_}
echo $jobName
+calibJob=${jobName}_c
-qsub -N $jobName /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $1/calib
-qsub -hold_jid $jobName /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $1
+qsub -N $calibJob /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $1/calib
+qsub -N $jobName -hold_jid $calibJob /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $1
--
GitLab