Changeset 23210

Timestamp:

09/04/18 06:14:48 (7 years ago)

Author:

bdef

Message:

BUG:updating Stallo cluster file

File:

• issm/trunk-jpl/src/m/classes/clusters/stallo.py (modified) (4 diffs)

issm/trunk-jpl/src/m/classes/clusters/stallo.py

@@ -12 +12 @@
 except ImportError:
         print 'You need stallo_settings.py to proceed, check presence and sys.path'
-        
+
 class stallo(object):
         """
         Stallo cluster class definition
         This is a SLURM queue
-        The priorities are given to: 
+        The priorities are given to:
            - Large jobs
            - Short jobs
@@ -23 +23 @@
 
         There are some 20cpu nodes and 16cpu nodes, with 32GB (a few with 128GB) mem per node, you can ask for part of a node if you need more memory.(1 node, 2 CPUS and 10GB per cpu for example)
-        
+
 
            Usage:
@@ -53 +53 @@
                 self.np=self.numnodes*self.cpuspernode          
         # }}}
-        
+
         def __repr__(self):
         # {{{
@@ -104 +104 @@
                 if isoceancoupling:
                         executable='issm_ocean.exe'
-                #write queuing script 
+                #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)
-                fid.write('#SBATCH --partition %s \n' % self.queue)
-                fid.write('#SBATCH --nodes=%i' % self.numnodes)
-                fid.write('#SBATCH --ntasks-per-nodes==%i \n' % self.cpuspernode)                                                                       
-                fid.write('#SBATCH --time=%s\n' % self.time) #walltime is minutes
+                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)
+                h,m=divmod(m, 60)
+                d,h=divmod(h, 60)
+                timestring="%02d-%02d:%02d:%02d" % (d, h, m, s)
+                fid.write('#SBATCH --time=%s\n' % timestring) #walltime is minutes
                 fid.write('#SBATCH --mem-per-cpu=%iGB\n' % self.mem)# mem is in GB
                 if (np.mod(self.np,16)+np.mod(self.np,20))==0:
                         fid.write('#SBATCH --ntask=%i\n' % self.np)
-                fid.write('#SBATCH --account=%s\n' % self.accountname) 
+                fid.write('#SBATCH --account=%s\n' % self.accountname)
                 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))