Changeset 13281

Timestamp:

09/06/12 16:00:19 (13 years ago)

Author:

schlegel

Message:

CHG: Python: cluster pass directory argument in issm execution to be full path to bin file.

File:

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

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

@@ -80 +80 @@
                         if not isvalgrind:
                                 if self.interactive:
-                                        fid.write('mpiexec -np %i %s/issm.exe %s %s %s ' % (self.np,self.codepath,EnumToString(solution)[0],self.executionpath,modelname))
+                                        fid.write('mpiexec -np %i %s/issm.exe %s %s/%s %s ' % (self.np,self.codepath,EnumToString(solution)[0],self.executionpath,dirname,modelname))
                                 else:
-                                        fid.write('mpiexec -np %i %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ' % (self.np,self.codepath,EnumToString(solution)[0],self.executionpath,modelname,modelname,modelname))
+                                        fid.write('mpiexec -np %i %s/issm.exe %s %s/%s %s 2> %s.errlog >%s.outlog ' % (self.np,self.codepath,EnumToString(solution)[0],self.executionpath,dirname,modelname,modelname,modelname))
                         elif isgprof:
                                 fid.write('\n gprof %s/issm.exe gmon.out > %s.performance' % (self.codepath,modelname))
@@ -88 +88 @@
                                 #Add --gen-suppressions=all to get suppression lines
                                 fid.write('LD_PRELOAD=%s \\\n' % self.valgrindlib)
-                                fid.write('mpiexec -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ' % \
-                                        (self.np,self.valgrind,self.valgrindsup,self.codepath,EnumToString(solution)[0],self.executionpath,modelname,modelname,modelname))
+                                fid.write('mpiexec -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s/%s %s 2> %s.errlog >%s.outlog ' % \
+                                        (self.np,self.valgrind,self.valgrindsup,self.codepath,EnumToString(solution)[0],self.executionpath,dirname,modelname,modelname,modelname))
                         if not io_gather:    #concatenate the output files:
                                 fid.write('\ncat %s.outbin.* > %s.outbin' % (modelname,modelname))
@@ -99 +99 @@
                         fid.write('@echo off\n')
                         if self.interactive:
-                                fid.write('"%s/issm.exe" %s "%s" %s ' % (self.codepath,EnumToString(solution)[0],self.executionpath,modelname))
+                                fid.write('"%s/issm.exe" %s "%s/%s" %s ' % (self.codepath,EnumToString(solution)[0],self.executionpath,dirname,modelname))
                         else:
-                                fid.write('"%s/issm.exe" %s "%s" %s 2> %s.errlog >%s.outlog' % \
-                                        (self.codepath,EnumToString(solution)[0],self.executionpath,modelname,modelname,modelname))
+                                fid.write('"%s/issm.exe" %s "%s/%s" %s 2> %s.errlog >%s.outlog' % \
+                                        (self.codepath,EnumToString(solution)[0],self.executionpath,dirname,modelname,modelname,modelname))
                         fid.close()
 
@@ -122 +122 @@
                         if not isvalgrind:
                                 if self.interactive:
-                                        fid.write('mpiexec -np %i %s/kriging.exe %s %s ' % (self.np,self.codepath,self.executionpath,modelname))
+                                        fid.write('mpiexec -np %i %s/kriging.exe %s/%s %s ' % (self.np,self.codepath,self.executionpath,modelname,modelname))
                                 else:
-                                        fid.write('mpiexec -np %i %s/kriging.exe %s %s 2> %s.errlog >%s.outlog ' % (self.np,self.codepath,self.executionpath,modelname,modelname,modelname))
+                                        fid.write('mpiexec -np %i %s/kriging.exe %s/%s %s 2> %s.errlog >%s.outlog ' % (self.np,self.codepath,self.executionpath,modelname,modelname,modelname,modelname))
                         elif isgprof:
                                 fid.write('\n gprof %s/kriging.exe gmon.out > %s.performance' & (self.codepath,modelname))
@@ -130 +130 @@
                                 #Add --gen-suppressions=all to get suppression lines
                                 fid.write('LD_PRELOAD=%s \\\n' % self.valgrindlib)
-                                fid.write('mpiexec -np %i %s --leak-check=full --suppressions=%s %s/kriging.exe %s %s 2> %s.errlog >%s.outlog ' % \
-                                        (self.np,self.valgrind,self.valgrindsup,self.codepath,self.executionpath,modelname,modelname,modelname))
+                                fid.write('mpiexec -np %i %s --leak-check=full --suppressions=%s %s/kriging.exe %s/%s %s 2> %s.errlog >%s.outlog ' % \
+                                        (self.np,self.valgrind,self.valgrindsup,self.codepath,self.executionpath,modelname,modelname,modelname,modelname))
                         if not io_gather:    #concatenate the output files:
                                 fid.write('\ncat %s.outbin.* > %s.outbin' % (modelname,modelname))
@@ -141 +141 @@
                         fid.write('@echo off\n')
                         if self.interactive:
-                                fid.write('"%s/issm.exe" %s "%s" %s ' % (self.codepath,EnumToString(solution)[0],self.executionpath,modelname))
+                                fid.write('"%s/issm.exe" %s "%s/%s" %s ' % (self.codepath,EnumToString(solution)[0],self.executionpath,modelname,modelname))
                         else:
-                                fid.write('"%s/issm.exe" %s "%s" %s 2> %s.errlog >%s.outlog' % \
-                                        (self.codepath,EnumToString(solution)[0],self.executionpath,modelname,modelname,modelname))
+                                fid.write('"%s/issm.exe" %s "%s/%s" %s 2> %s.errlog >%s.outlog' % \
+                                        (self.codepath,EnumToString(solution)[0],self.executionpath,modelname,modelname,modelname,modelname))
                         fid.close()