# HG changeset patch
# User Henry S. Thompson <ht@inf.ed.ac.uk>
# Date 1585225413 0
# Node ID e34cda3e7483dba7aa5583a35a8e657c6854a597
# Parent  4c23b1766692a74d7cd9985c9592daec698607b5
pass through extract args

diff -r 4c23b1766692 -r e34cda3e7483 bin/masterMaster.sh
--- a/bin/masterMaster.sh	Tue Mar 24 17:53:35 2020 +0000
+++ b/bin/masterMaster.sh	Thu Mar 26 12:23:33 2020 +0000
@@ -1,5 +1,8 @@
 #!/bin/bash
 # This runs on login machine to launch the real job (named by $1) on two machines
+# Any further args are passed to parallel
 echo $(date) Launching master workers for "$@"
-seq 1 -1 0 | parallel --will-cite --joblog master_$1.log -S r1i5n1 -S r1i5n0 -N 1 --workdir /dev/shm --transferfile $1_'{}'.txt --transferfile by11s.txt $HOME/bin/$1.sh '{}'
-echo $(date) "$@" workers done
+task=$1
+shift
+seq 1 -1 0 | parallel --will-cite --joblog master_$task.log -S r1i5n1 -S r1i5n0 -N 1 --workdir /dev/shm --transferfile ${task}_'{}'.txt $* $HOME/bin/$task.sh '{}'
+echo $(date) $task "$@" workers done
diff -r 4c23b1766692 -r e34cda3e7483 masterJob.sh
--- a/masterJob.sh	Tue Mar 24 17:53:35 2020 +0000
+++ b/masterJob.sh	Thu Mar 26 12:23:33 2020 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Attempt at a master Master job
-# Usage: qsub -v t=taskName masterJob.sh
+# Usage: qsub -v t=taskName[, x=extras] masterJob.sh
 # Implies that ~/taskName_{0,1}.txt contain the necessary parameterisation
 #PBS -l select=2:ncpus=36
 #PBS -l place=exclhost
@@ -8,10 +8,10 @@
 #PBS -V
 #PBS -A dc007
 #PBS -N master
-
+#
 #module load mpt
 
 cd ${PBS_O_WORKDIR}
 
-bin/masterMaster.sh "$t"
+bin/masterMaster.sh "$t" $x