Split out scenarios into ensemble directories

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

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