Changeset 23230

Timestamp:

09/07/18 08:18:21 (7 years ago)

Author:

bdef

Message:

NEW: adding matlab stallo and updating py

Location:

issm/trunk-jpl/src/m/classes/clusters

Files:

• stallo.m (added)
• stallo.py (modified) (3 diffs)

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

@@ -51 +51 @@
                 #OK get other fields
                 self=options.AssignObjectFields(self)
-                self.np=self.numnodes*self.cpuspernode          
+                self.np=self.numnodes*self.cpuspernode
         # }}}
 
@@ -61 +61 @@
                 s = "%s\n%s"%(s,fielddisplay(self,'login','login'))
                 s = "%s\n%s"%(s,fielddisplay(self,'numnodes','number of nodes'))
-                s = "%s\n%s"%(s,fielddisplay(self,'cpuspernode','number of nodes per CPUs'))
+                s = "%s\n%s"%(s,fielddisplay(self,'cpuspernode','number of CPUs per nodes'))
                 s = "%s\n%s"%(s,fielddisplay(self,'mem','memory per CPU'))
                 s = "%s\n%s"%(s,fielddisplay(self,'queue','name of the queue (normal (D), short,singlenode,multinode,devel)'))
@@ -120 +120 @@
                 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
+#               timestring="%02d-%02d:%02d:%02d" % (d, h, m, s)
+                fid.write('#SBATCH --time={}\n'.format(timestring)) #walltime is minutes
+                fid.write('#SBATCH --mem-per-cpu={}MB\n'.format(1000*self.mem))# mem is in MB (to keep it integral)
                 if (np.mod(self.np,16)+np.mod(self.np,20))==0:
                         fid.write('#SBATCH --ntask=%i\n' % self.np)