merge Spider into master

Merge branches before making minor changes (e.g., updating json files / repo to deal with spider issue #1) so this doesn't have to be done twice

GRID_LRT/application/submit.py

@@ -372,20 +372,19 @@ class SpiderLauncher(JdlLauncher):
             raise IOError("Launch file doesn't exist! "+self.launch_file)
         slurmfile = '#!/usr/bin/env bash\n'
         if self.wholenodes:
-            slurmfile += '#SBATCH --exclusive --nodes=1 --ntasks 1--cpus-per-task={ncpu:d} -p {queue:s} --array 1-{njobs:d}%{concurrent:d} --output=spiderjob-%A_%a.out --error=spiderjob-%A_%a.err\n'
+            slurmfile += '#SBATCH --exclusive --nodes=1 --ntasks 1 --cpus-per-task={ncpu:d} -p {queue:s} --array 1-{njobs:d}%{concurrent:d} --output=spiderjob-%A_%a.out --error=spiderjob-%A_%a.err\n'
         else:
             slurmfile += '#SBATCH --nodes=1 --ntasks 1 --cpus-per-task={ncpu:d} -p {queue:s} --array 1-{njobs:d}%{concurrent:d} --output=spiderjob-%A_%a.out --error=spiderjob-%A_%a.err\n'
         slurmfile += """
 echo Job landed on $(hostname)
-JOBDIR=$(mktemp -d -p $TMPDIR)
-cd $TMPDIR
+JOBDIR=$TMPDIR
 export JOBDIR
 echo Created job directory $JOBDIR
 cd $JOBDIR
 {launcher:s} {db:s} {usr:s} {pw:s} {tt:s}
 """
 	slurmfile = slurmfile.format(ncpu=int(self.ncpu),
-        queueu=str(self.queue),
+        queue=str(self.queue),
         njobs=self.numjobs,
         concurrent=self.parameter_step,
         launcher=str(self.launch_file),