Changeset 16137 for issm/trunk/src/m/classes/clusters/generic.py

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/clusters/generic.py (modified) (3 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

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

@@ -1 +1 @@
 import socket
-import os
 import math
 import subprocess
+from IssmConfig import IssmConfig
 from EnumToString import EnumToString
 from issmdir import *
 from pairoptions import *
-from ismpi import *
 from issmssh import *
 from issmscpin import *
@@ -81 +80 @@
                         if not isvalgrind:
                                 if self.interactive: 
-                                        if ismpi():
+                                        if IssmConfig('_HAVE_MPI_')[0]:
                                                 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:
-                                        if ismpi():
+                                        if IssmConfig('_HAVE_MPI_')[0]:
                                                 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:
@@ -95 +94 @@
                                 #Add --gen-suppressions=all to get suppression lines
                                 fid.write('LD_PRELOAD=%s \\\n' % self.valgrindlib)
-                                if ismpi():
+                                if IssmConfig('_HAVE_MPI_')[0]:
                                         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))

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad