From d62417b7871d0a934e2159032e214a995a4ff98f Mon Sep 17 00:00:00 2001
From: Peter Alexander <p.m.w.alexander@gmail.com>
Date: Fri, 14 Apr 2017 14:59:05 +0100
Subject: [PATCH] Split out scenarios into ensemble directories
---
scripts/createScenarios.sh | 12 +++++++++---
scripts/scheduleScenarios.sh | 11 ++++++-----
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/scripts/createScenarios.sh b/scripts/createScenarios.sh
index 514b7748..310d2b2d 100755
--- a/scripts/createScenarios.sh
+++ b/scripts/createScenarios.sh
@@ -22,9 +22,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
elif [ $overwrite -ne 1 ]; then
diff --git a/scripts/scheduleScenarios.sh b/scripts/scheduleScenarios.sh
index 77aa5c43..75065203 100755
--- a/scripts/scheduleScenarios.sh
+++ b/scripts/scheduleScenarios.sh
@@ -17,17 +17,18 @@ do
if [ -z "$header" ]; then
header=( "${array[@]}" )
else
- scenario="${array[0]}"
- scenario_dir=$output_dir/$scenario
- echo $scenario
+ ensemble="${array[0]}"
+ scenario="${array[1]}"
+ scenario_dir=$output_dir/$ensemble/$scenario
+ echo $scenario for $ensemble
if [ ! -d "$scenario_dir" ]; then
echo "Scenario $scenario dir is missing, so skipping"
continue;
fi
- echo "qsub /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $scenario"
- qsub /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $scenario
+ echo "qsub /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $ensemble/$scenario"
+ qsub /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $ensemble/$scenario
fi
done < $filename
--
GitLab