Changeset 20143

Timestamp:

02/12/16 10:56:26 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not use batch mode if batch=0

File:

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

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

@@ -190 +190 @@
                 else:
                         if batch:
+                                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)
+                        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' % \
-                                (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)
-
+                                        (self.executionpath,dirname,dirname,dirname,dirname,dirname,modelname,modelname)
                 issmssh(self.name,self.login,self.port,launchcommand)
         # }}}