Index: /issm/trunk-jpl/src/m/classes/clusters/stallo.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/stallo.py	(revision 24806)
+++ /issm/trunk-jpl/src/m/classes/clusters/stallo.py	(revision 24807)
@@ -45,4 +45,5 @@
         self.accountname = ''
         self.profiling = 0
+        self.exclusive = False
     #use provided options to change fields
         options = pairoptions(*args)
@@ -74,6 +75,6 @@
     def checkconsistency(self, md, solution, analyses):  # {{{
         #Queue dictionarry  gives queue name as key and max walltime and cpus as var
-        queuedict = {'short': [60, 2048],
-                     'normal': [2 * 24 * 60, 2048],
+        queuedict = {'short': [2 * 24 * 60, 2048],
+                     'normal': [5 * 24 * 60, 2048],
                      'singlenode': [28 * 24 * 60, 20],
                      'multinode': [28 * 24 * 60, 2048],
@@ -114,5 +115,10 @@
         fid.write('#!/bin/bash -l\n')
         fid.write('#SBATCH --job-name=%s \n' % shortname)
-        fid.write('#SBATCH --qos=%s \n' % self.queue)
+        if self.queue in ['devel', 'short']:
+            fid.write('#SBATCH --qos=%s \n' % self.queue)
+        else:
+            fid.write('#SBATCH --partition=%s \n' % self.queue)
+            if self.time < 2 * 24 * 60:
+                fid.write('#SBATCH --qos=short \n')
         fid.write('#SBATCH --nodes=%i \n' % self.numnodes)
         fid.write('#SBATCH --ntasks-per-node=%i \n' % self.cpuspernode)
@@ -124,4 +130,6 @@
         fid.write('#SBATCH --output %s/%s/%s.outlog \n' % (self.executionpath, dirname, modelname))
         fid.write('#SBATCH --error %s/%s/%s.errlog \n\n' % (self.executionpath, dirname, modelname))
+        if self.exclusive:
+            fid.write('#SBATCH --exclusive \n')
 
         fid.write('export ISSM_DIR="%s/../"\n' % self.codepath)