Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/clusters/hexagon.py

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/clusters/hexagon.py (modified) (4 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/clusters/hexagon.py

@@ -41 +41 @@
                 #initialize cluster using user settings if provided
                 self=hexagon_settings(self)
-                self.np=self.numnodes*self.procspernodes
+
                 #OK get other fields
                 self=options.AssignObjectFields(self)
-                
+                self.np=self.numnodes*self.procspernodes
                 # }}}
         def __repr__(self):
@@ -81 +81 @@
                 return self
                 # }}}
-        def BuildQueueScript(self,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota):
+        def BuildQueueScript(self,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota,isoceancoupling):
                 # {{{
 
@@ -90 +90 @@
                         if version>=6:
                                 executable='issm_dakota.exe'
+                if isoceancoupling:
+                        executable='issm_ocean.exe'
 
                 #write queuing script 
@@ -97 +99 @@
                 fid.write('#PBS -N %s \n' % shortname)
                 fid.write('#PBS -l mppwidth=%i,mppnppn=%i\n' % (self.np,self.procspernodes))
-                timestring= str(datetime.timedelta(minutes=self.time))
+                timeobj=datetime.timedelta(minutes=self.time)
+                m,s=divmod(timeobj.total_seconds(), 60)
+                h,m=divmod(m, 60)
+                timestring="%02d:%02d:%02d" % (h, m, s)
                 fid.write('#PBS -l walltime=%s\n' % timestring) #walltime is hh:mm:ss
                 fid.write('#PBS -l mppmem=%imb\n' % int(self.mem/self.procspernodes))