Index: /issm/trunk-jpl/src/m/classes/clusters/stallo.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/stallo.m	(revision 23377)
+++ /issm/trunk-jpl/src/m/classes/clusters/stallo.m	(revision 23378)
@@ -98,14 +98,15 @@
 			 end
 
+			 days=floor(cluster.time/(60*24));
+			 hours=floor((cluster.time-(days*60*24))/60);
+			 minutes=floor(mod((cluster.time-(days*60*24)-(hours*60)),60));
+
 			 %write queuing script
 			 fid=fopen([modelname '.queue'],'w');
 			 fprintf(fid,'#!/bin/bash -l\n');
 			 fprintf(fid,'#SBATCH --job-name=%s \n',modelname);
-			 fprintf(fid,'#SBATCH --qos %s \n',cluster.queue);
+			 fprintf(fid,'#SBATCH --qos=%s \n',cluster.queue);
 			 fprintf(fid,'#SBATCH --nodes=%i \n',cluster.numnodes);
 			 fprintf(fid,'#SBATCH --ntasks-per-node=%i \n',cluster.cpuspernode);
-			 days=floor(cluster.time/(60*24));
-			 hours=floor((cluster.time-(days*60*24))/60);
-			 minutes=floor(mod((cluster.time-(days*60*24)-(hours*60)),60));
 			 fprintf(fid,'#SBATCH --time=%02i-%02i:%02i:00 \n',days,hours,minutes);
 			 fprintf(fid,'#SBATCH --mem-per-cpu=%iMB\n',1000*cluster.mem); % mem in MB
@@ -116,4 +117,5 @@
  			 fprintf(fid,'#SBATCH --output %s/%s/%s.outlog \n',cluster.executionpath,dirname,modelname);
  			 fprintf(fid,'#SBATCH --error %s/%s/%s.errlog \n\n',cluster.executionpath,dirname,modelname);
+
  			 fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath);%FIXME
  			 fprintf(fid,'module purge\n');
Index: /issm/trunk-jpl/src/m/classes/clusters/stallo.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/stallo.py	(revision 23377)
+++ /issm/trunk-jpl/src/m/classes/clusters/stallo.py	(revision 23378)
@@ -106,14 +106,4 @@
 		#write queuing script
 		shortname=modelname[0:min(12,len(modelname))]
-		fid=open(modelname+'.queue','w')
-
-		fid.write('#!/bin/bash -l\n')
-		fid.write('#SBATCH --job-name=%s \n' % shortname)
-		if self.queue=='devel':
-			fid.write('#SBATCH --qos %s \n' % self.queue)
-		else:
-			fid.write('#SBATCH --partition %s \n' % self.queue)
-		fid.write('#SBATCH --nodes=%i \n' % self.numnodes)
-		fid.write('#SBATCH --ntasks-per-node=%i \n' % self.cpuspernode)
 		timeobj=datetime.timedelta(minutes=self.time)
 		m,s=divmod(timeobj.total_seconds(), 60)
@@ -121,6 +111,13 @@
 		d,h=divmod(h, 60)
 		timestring="%02d-%02d:%02d:%02d" % (d, h, m, s)
+
+		fid=open(modelname+'.queue','w')
+		fid.write('#!/bin/bash -l\n')
+		fid.write('#SBATCH --job-name=%s \n' % shortname)
+		fid.write('#SBATCH --qos=%s \n' % self.queue)
+		fid.write('#SBATCH --nodes=%i \n' % self.numnodes)
+		fid.write('#SBATCH --ntasks-per-node=%i \n' % self.cpuspernode)
 		fid.write('#SBATCH --time={}\n'.format(timestring)) #walltime is minutes
-		fid.write('#SBATCH --mem-per-cpu={}MB\n'.format(int(1000*self.mem)))# mem is in MB (to keep it integral)
+		fid.write('#SBATCH --mem-per-cpu={}MB\n'.format(int(1000*self.mem)))# mem is in MB
 		if (np.mod(self.np,16)+np.mod(self.np,20))==0:
 			fid.write('#SBATCH --ntask=%i\n' % self.np)