Changeset 13305

Timestamp:

09/08/12 10:47:48 (13 years ago)

Author:

Eric.Larour

Message:

CHG: run even when mpi is not available

File:

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

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

@@ -79 +79 @@
                         fid.write('#!/bin/sh\n')
                         if not isvalgrind:
-                                if self.interactive:
-                                        fid.write('mpiexec -np %i %s/issm.exe %s %s/%s %s ' % (self.np,self.codepath,EnumToString(solution)[0],self.executionpath,dirname,modelname))
+                                if self.interactive: 
+                                        if ismpi():
+                                                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('%s/issm.exe %s %s/%s %s ' % (self.codepath,EnumToString(solution)[0],self.executionpath,dirname,modelname))
                                 else:
-                                        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))
+                                        if ismpi():
+                                                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))
+                                        else:
+                                                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))
                         elif isgprof:
                                 fid.write('\n gprof %s/issm.exe gmon.out > %s.performance' % (self.codepath,modelname))
@@ -88 +94 @@
                                 #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 %s 2> %s.errlog >%s.outlog ' % \
-                                        (self.np,self.valgrind,self.valgrindsup,self.codepath,EnumToString(solution)[0],self.executionpath,dirname,modelname,modelname,modelname))
+                                if ismpi():
+                                        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))
+                                else:   
+                                        fid.write('%s --leak-check=full --suppressions=%s %s/issm.exe %s %s/%s %s 2> %s.errlog >%s.outlog ' % \
+                                                        (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))