Changeset 20120 for issm/trunk-jpl/src/m/classes/clusters/generic.py

Timestamp:

02/11/16 14:55:01 (9 years ago)

Author:

Eric.Larour

Message:

CHG: added batch flag for the LaunchQueueJob and reordered the sequence in solve because
in generic clusters, in batch mode, we were not uploading anything!

File:

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

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

@@ -183 +183 @@
 
         # }}}
-        def LaunchQueueJob(self,modelname,dirname,filelist,restart):    # {{{
+        def LaunchQueueJob(self,modelname,dirname,filelist,restart,batch):    # {{{
 
                 print 'launching solution sequence on remote cluster'
@@ -189 +189 @@
                         launchcommand='cd %s && cd %s chmod 777 %s.queue && ./%s.queue' % (self.executionpath,dirname,modelname,modelname)
                 else:
-                        launchcommand='cd %s && rm -rf ./%s && mkdir %s && cd %s && mv ../%s.tar.gz ./ && tar -zxf %s.tar.gz  && chmod 777 %s.queue && ./%s.queue' % \
+                        if batch:
+                                launchcommand='cd %s && rm -rf ./%s && mkdir %s && cd %s && mv ../%s.tar.gz ./ && tar -zxf %s.tar.gz  && chmod 777 %s.queue && ./%s.queue' % \
                                 (self.executionpath,dirname,dirname,dirname,dirname,dirname,modelname,modelname)
+                        else:
+                                launchcommand='cd %s && rm -rf ./%s && mkdir %s && cd %s && mv ../%s.tar.gz ./ && tar -zxf %s.tar.gz' % \
+                                (self.executionpath,dirname,dirname,dirname,dirname,dirname)
+
                 issmssh(self.name,self.login,self.port,launchcommand)
         # }}}