Changeset 21050

Timestamp:

08/02/16 17:22:43 (9 years ago)

Author:

agscott1

Message:

BUG: Fixed clusters for updated matlab and python code

Location:

issm/trunk-jpl/src/m/classes/clusters

Files:

• acenet.m (modified) (1 diff)
• castor.m (modified) (1 diff)
• cloud.m (modified) (1 diff)
• cosmos.m (modified) (1 diff)
• cyclone.py (modified) (2 diffs)
• discover.m (modified) (2 diffs)
• gemini.m (modified) (1 diff)
• generic.m (modified) (5 diffs)
• generic.py (modified) (5 diffs)
• generic_static.m (modified) (1 diff)
• greenplanet.m (modified) (2 diffs)
• hexagon.py (modified) (2 diffs)
• hpc.m (modified) (2 diffs)
• lonestar.m (modified) (2 diffs)
• pfe.m (modified) (4 diffs)
• pfe.py (modified) (2 diffs)
• pollux.m (modified) (1 diff)
• raijin.m (modified) (1 diff)
• vilje.m (modified) (2 diffs)
• vilje.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/clusters/acenet.m

@@ -128 +128 @@
                          fprintf(fid,'\n');
                          fprintf(fid,'mpiexec %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog\n',...
-                                 cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
+                                 cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname,modelname,modelname);
                          %fprintf(fid,'echo $HOSTNAME >>%s.outlog',modelname);
                          fclose(fid);

issm/trunk-jpl/src/m/classes/clusters/castor.m

@@ -65 +65 @@
                          fprintf(fid,'cd $PBS_O_WORKDIR\n');
                          fprintf(fid,'export OMP_NUM_THREADS=1\n');
-                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
                          fclose(fid);
 

issm/trunk-jpl/src/m/classes/clusters/cloud.m

@@ -56 +56 @@
                                 fprintf(fid,'source %s%s\n',cluster.codepath,'/../etc/environment.sh');
                                 fprintf(fid,'cd %s\n',[cluster.executionpath '/' dirname]);
-                                fprintf(fid,'mpiexec -np %i -f /home/mpich2.hosts %s/issm.exe %s %s %s 2> %s.errlog > /dev/stdout | tee %s.outlog ',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
+                                fprintf(fid,'mpiexec -np %i -f /home/mpich2.hosts %s/issm.exe %s %s %s 2> %s.errlog > /dev/stdout | tee %s.outlog ',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname,modelname,modelname);
                         else
                                 fprintf(fid,'source %s%s\n',cluster.codepath,'/../etc/environment.sh');
                                 fprintf(fid,'cd %s\n',[cluster.executionpath '/' dirname]);
-                                fprintf(fid,'mpiexec -np %i -f /home/mpich2.hosts %s/issm.exe %s %s %s 2> %s.errlog > /dev/stdout | tee %s.outlog ',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
-                                %fprintf(fid,'mpiexec -np %i -f /home/mpich2.hosts %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
+                                fprintf(fid,'mpiexec -np %i -f /home/mpich2.hosts %s/issm.exe %s %s %s 2> %s.errlog > /dev/stdout | tee %s.outlog ',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname,modelname,modelname);
                         end
                 end

issm/trunk-jpl/src/m/classes/clusters/cosmos.m

@@ -65 +65 @@
                          fprintf(fid,'ulimit -s unlimited\n');
                          fprintf(fid,'ulimit -c 0\n');
-                         fprintf(fid,'/opt/mpich/gm/intel10.1/bin/mpiexec -np %i %s/issm.exe %s %s %s',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                         fprintf(fid,'/opt/mpich/gm/intel10.1/bin/mpiexec -np %i %s/issm.exe %s %s %s',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
                          fclose(fid);
 

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

@@ -1 +1 @@
 import subprocess
 from fielddisplay import fielddisplay
-from EnumToString import EnumToString
 from pairoptions import pairoptions
 from issmssh import issmssh
@@ -89 +88 @@
                 rundir=self.executionpath+'/'+dirname
                 runfile=self.executionpath+'/'+dirname+'/'+modelname
-                fid.write('mpiexec -np %i %s/%s %s %s %s >%s.outlog 2>%s.errlog\n' % (self.np,self.codepath,executable,str(EnumToString(solution)[0]),rundir,modelname,runfile,runfile))
+                fid.write('mpiexec -np %i %s/%s %s %s %s >%s.outlog 2>%s.errlog\n' % (self.np,self.codepath,executable,str(solution),rundir,modelname,runfile,runfile))
                 fid.close()
 

issm/trunk-jpl/src/m/classes/clusters/discover.m

@@ -129 +129 @@
                          fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
 
-                         fprintf(fid,'mpirun -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                         fprintf(fid,'mpirun -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
                          if ~io_gather, %concatenate the output files:
                                  fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
@@ -139 +139 @@
                                  fid=fopen([modelname '.run'],'w');
                                  if ~isvalgrind,
-                                         fprintf(fid,'mpirun -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                                         fprintf(fid,'mpirun -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
                                  else
-                                         fprintf(fid,'mpirun -np %i valgrind --leak-check=full %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                                         fprintf(fid,'mpirun -np %i valgrind --leak-check=full %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
                                  end
                                  if ~io_gather, %concatenate the output files:

issm/trunk-jpl/src/m/classes/clusters/gemini.m

@@ -66 +66 @@
                          fprintf(fid,'cd $PBS_O_WORKDIR\n');
                          fprintf(fid,'export OMP_NUM_THREADS=1\n');
-                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
                          fclose(fid);
 

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

@@ -91 +91 @@
                                         if cluster.interactive
                                                 if IssmConfig('_HAVE_MPI_'),
-                                                        fprintf(fid,'mpiexec -np %i %s/%s %s %s %s \n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                                                        fprintf(fid,'mpiexec -np %i %s/%s %s %s %s \n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
                                                 else
-                                                        fprintf(fid,'%s/%s %s %s %s ',cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                                                        fprintf(fid,'%s/%s %s %s %s ',cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
                                                 end
                                         else
                                                 if IssmConfig('_HAVE_MPI_'),
-                                                        fprintf(fid,'mpiexec -np %i %s/%s %s %s %s 2> %s.errlog >%s.outlog &',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
+                                                        fprintf(fid,'mpiexec -np %i %s/%s %s %s %s 2> %s.errlog >%s.outlog &',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname,modelname,modelname);
                                                 else
-                                                        fprintf(fid,'%s/%s %s %s %s 2> %s.errlog >%s.outlog &',cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
+                                                        fprintf(fid,'%s/%s %s %s %s 2> %s.errlog >%s.outlog &',cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname,modelname,modelname);
                                                 end
                                         end
@@ -110 +110 @@
                                                 if IssmConfig('_HAVE_MPI_'),
                                                         fprintf(fid,'mpiexec -np %i %s --leak-check=full --error-limit=no --dsymutil=yes --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',...
-                                                        cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname], modelname,modelname,modelname);
+                                                        cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,solution,[cluster.executionpath '/' dirname], modelname,modelname,modelname);
                                                 else
                                                         fprintf(fid,'%s --leak-check=full --dsymutil=yes --error-limit=no --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',...
-                                                        cluster.valgrind,cluster.valgrindsup,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname], modelname,modelname,modelname);
+                                                        cluster.valgrind,cluster.valgrindsup,cluster.codepath,solution,[cluster.executionpath '/' dirname], modelname,modelname,modelname);
                                                 end
                                         else
                                                 if IssmConfig('_HAVE_MPI_'),
                                                         fprintf(fid,'mpiexec -np %i %s --leak-check=full --error-limit=no --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',...
-                                                        cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
+                                                        cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname,modelname,modelname);
                                                 else
                                                         fprintf(fid,'%s --leak-check=full --error-limit=no --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',...
-                                                        cluster.valgrind,cluster.valgrindsup,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
+                                                        cluster.valgrind,cluster.valgrindsup,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname,modelname,modelname);
                                                 end
                                         end
@@ -141 +141 @@
 
                                 if cluster.np>1,
-                                        fprintf(fid,'"C:\\Program Files\\MPICH2\\bin\\mpiexec.exe" -n %i "%s/issm.exe" %s ./ %s ',cluster.np,cluster.codepath,EnumToString(solution),modelname);
-                                else
-                                        fprintf(fid,'"%s/issm.exe" %s ./ %s ',cluster.codepath,EnumToString(solution),modelname);
+                                        fprintf(fid,'"C:\\Program Files\\MPICH2\\bin\\mpiexec.exe" -n %i "%s/issm.exe" %s ./ %s ',cluster.np,cluster.codepath,solution,modelname);
+                                else
+                                        fprintf(fid,'"%s/issm.exe" %s ./ %s ',cluster.codepath,solution,modelname);
                                 end
                                 fclose(fid);
@@ -177 +177 @@
                         
                         %solution name: 
-                        mpistring=[mpistring sprintf('%s ',EnumToString(solution))];
+                        mpistring=[mpistring sprintf('%s ',solution)];
 
                         %execution directory and model name: 
@@ -237 +237 @@
                                 fprintf(fid,'@echo off\n');
                                 if cluster.interactive
-                                        fprintf(fid,'"%s/issm.exe" %s "%s" %s ',cluster.codepath,EnumToString(solution),[cluster.executionpath '/' modelname],modelname);
+                                        fprintf(fid,'"%s/issm.exe" %s "%s" %s ',cluster.codepath,solution,[cluster.executionpath '/' modelname],modelname);
                                 else
                                         fprintf(fid,'"%s/issm.exe" %s "%s" %s 2> %s.errlog >%s.outlog',...
-                                                cluster.codepath,EnumToString(solution),[cluster.executionpath '/' modelname],modelname,modelname,modelname);
+                                                cluster.codepath,solution,[cluster.executionpath '/' modelname],modelname,modelname,modelname);
                                 end
                                 fclose(fid);

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

@@ -4 +4 @@
 import subprocess
 from IssmConfig import IssmConfig
-from EnumToString import EnumToString
 from issmdir import issmdir
 from pairoptions import pairoptions
@@ -86 +85 @@
                                 if self.interactive: 
                                         if IssmConfig('_HAVE_MPI_')[0]:
-                                                fid.write('mpiexec -np %i %s/%s %s %s/%s %s ' % (self.np,self.codepath,executable,EnumToString(solution)[0],self.executionpath,dirname,modelname))
+                                                fid.write('mpiexec -np %i %s/%s %s %s/%s %s ' % (self.np,self.codepath,executable,solution,self.executionpath,dirname,modelname))
                                         else:
-                                                fid.write('%s/%s %s %s/%s %s ' % (self.codepath,executable,EnumToString(solution)[0],self.executionpath,dirname,modelname))
+                                                fid.write('%s/%s %s %s/%s %s ' % (self.codepath,executable,solution,self.executionpath,dirname,modelname))
                                 else:
                                         if IssmConfig('_HAVE_MPI_')[0]:
-                                                fid.write('mpiexec -np %i %s/%s %s %s/%s %s 2> %s.errlog >%s.outlog ' % (self.np,self.codepath,executable,EnumToString(solution)[0],self.executionpath,dirname,modelname,modelname,modelname))
+                                                fid.write('mpiexec -np %i %s/%s %s %s/%s %s 2> %s.errlog >%s.outlog ' % (self.np,self.codepath,executable,solution,self.executionpath,dirname,modelname,modelname,modelname))
                                         else:
-                                                fid.write('%s/%s %s %s/%s %s 2> %s.errlog >%s.outlog ' % (self.codepath,executable,EnumToString(solution)[0],self.executionpath,dirname,modelname,modelname,modelname))
+                                                fid.write('%s/%s %s %s/%s %s 2> %s.errlog >%s.outlog ' % (self.codepath,executable,solution,self.executionpath,dirname,modelname,modelname,modelname))
                         elif isgprof:
                                 fid.write('\n gprof %s/%s gmon.out > %s.performance' % (self.codepath,executable,modelname))
@@ -101 +100 @@
                                 if IssmConfig('_HAVE_MPI_')[0]:
                                         fid.write('mpiexec -np %i %s --leak-check=full --suppressions=%s %s/%s %s %s/%s %s 2> %s.errlog >%s.outlog ' % \
-                                                        (self.np,self.valgrind,self.valgrindsup,self.codepath,executable,EnumToString(solution)[0],self.executionpath,dirname,modelname,modelname,modelname))
+                                                        (self.np,self.valgrind,self.valgrindsup,self.codepath,executable,solution,self.executionpath,dirname,modelname,modelname,modelname))
                                 else:   
                                         fid.write('%s --leak-check=full --suppressions=%s %s/%s %s %s/%s %s 2> %s.errlog >%s.outlog ' % \
-                                                        (self.valgrind,self.valgrindsup,self.codepath,executable,EnumToString(solution)[0],self.executionpath,dirname,modelname,modelname,modelname))
+                                                        (self.valgrind,self.valgrindsup,self.codepath,executable,solution,self.executionpath,dirname,modelname,modelname,modelname))
 
                         if not io_gather:    #concatenate the output files:
@@ -115 +114 @@
                         fid.write('@echo off\n')
                         if self.interactive:
-                                fid.write('"%s/%s" %s "%s/%s" %s ' % (self.codepath,executable,EnumToString(solution)[0],self.executionpath,dirname,modelname))
+                                fid.write('"%s/%s" %s "%s/%s" %s ' % (self.codepath,executable,solution,self.executionpath,dirname,modelname))
                         else:
                                 fid.write('"%s/%s" %s "%s/%s" %s 2> %s.errlog >%s.outlog' % \
-                                        (self.codepath,executable,EnumToString(solution)[0],self.executionpath,dirname,modelname,modelname,modelname))
+                                        (self.codepath,executable,solution,self.executionpath,dirname,modelname,modelname,modelname))
                         fid.close()
 
@@ -156 +155 @@
                         fid.write('@echo off\n')
                         if self.interactive:
-                                fid.write('"%s/issm.exe" %s "%s/%s" %s ' % (self.codepath,EnumToString(solution)[0],self.executionpath,modelname,modelname))
+                                fid.write('"%s/issm.exe" %s "%s/%s" %s ' % (self.codepath,solution,self.executionpath,modelname,modelname))
                         else:
                                 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))
+                                        (self.codepath,solution,self.executionpath,modelname,modelname,modelname,modelname))
                         fid.close()
 

issm/trunk-jpl/src/m/classes/clusters/generic_static.m

@@ -72 +72 @@
                         fid=fopen([modelname '.queue'],'w');
                         fprintf(fid,'#!%s\n',cluster.shell);
-                        fprintf(fid,['%s/mpiexec -np %i %s/%s %s %s %s \n'],codepath2,cluster.np,codepath2,executable,EnumToString(solution),'./',modelname);
+                        fprintf(fid,['%s/mpiexec -np %i %s/%s %s %s %s \n'],codepath2,cluster.np,codepath2,executable,solution,'./',modelname);
                         fclose(fid);
 

issm/trunk-jpl/src/m/classes/clusters/greenplanet.m

@@ -112 +112 @@
                          fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
                          fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
-                         fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                         fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
                          if ~io_gather, %concatenate the output files:
                                  fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
@@ -121 +121 @@
                          if cluster.interactive,
                                  fid=fopen([modelname '.run'],'w');
-                                 fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                                 fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
                                  if ~io_gather, %concatenate the output files:
                                          fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);

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

@@ -1 +1 @@
 import subprocess
 from fielddisplay import fielddisplay
-from EnumToString import EnumToString
 from pairoptions import pairoptions
 from issmssh import issmssh
@@ -112 +111 @@
                 fid.write('module load gsl\n')
                 fid.write('cd %s/%s/\n\n' % (self.executionpath,dirname))
-                fid.write('aprun -B %s/%s %s %s/%s %s\n' % (self.codepath,executable,str(EnumToString(solution)[0]),self.executionpath,dirname,modelname))
+                fid.write('aprun -B %s/%s %s %s/%s %s\n' % (self.codepath,executable,str(solution),self.executionpath,dirname,modelname))
                 fid.close()
 

issm/trunk-jpl/src/m/classes/clusters/hpc.m

@@ -108 +108 @@
                          fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
                          fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
-                         fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                         fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
                          if ~io_gather, %concatenate the output files:
                                  fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
@@ -117 +117 @@
                          if cluster.interactive,
                                  fid=fopen([modelname '.run'],'w');
-                                 fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                                 fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
                                  if ~io_gather, %concatenate the output files:
                                          fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);

issm/trunk-jpl/src/m/classes/clusters/lonestar.m

@@ -137 +137 @@
                          fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
                          fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
-                         fprintf(fid,'ibrun -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                         fprintf(fid,'ibrun -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
                          if ~io_gather, %concatenate the output files:
                                  fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
@@ -151 +151 @@
                          if cluster.interactive,
                                  fid=fopen([modelname '.run'],'w');
-                                 fprintf(fid,'ibrun -np %i %s/%s %s %s %s\n',cluster.np,executable,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                                 fprintf(fid,'ibrun -np %i %s/%s %s %s %s\n',cluster.np,executable,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
                                  if ~io_gather, %concatenate the output files:
                                          fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);

issm/trunk-jpl/src/m/classes/clusters/pfe.m

@@ -168 +168 @@
                          fprintf(fid,'cd %s/%s/\n\n',cluster.executionpath,dirname);
                          if ~isvalgrind,
-                                 fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
-                         else
-                                 fprintf(fid,'mpiexec -np %i valgrind --leak-check=full %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                                 fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
+                         else
+                                 fprintf(fid,'mpiexec -np %i valgrind --leak-check=full %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
                          end
                          if ~io_gather, %concatenate the output files:
@@ -182 +182 @@
                                  if cluster.interactive==10,
                                                  fprintf(fid,'module unload mpi-mvapich2/1.4.1/gcc\n');
-                                                 fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[pwd() '/run'],modelname);
+                                                 fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[pwd() '/run'],modelname);
                                  else
                                          if ~isvalgrind,
-                                                 fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/Interactive' num2str(cluster.interactive)],modelname);
+                                                 fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/Interactive' num2str(cluster.interactive)],modelname);
                                          else
-                                                 fprintf(fid,'mpiexec -np %i valgrind --leak-check=full %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/Interactive' num2str(cluster.interactive)],modelname);
+                                                 fprintf(fid,'mpiexec -np %i valgrind --leak-check=full %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/Interactive' num2str(cluster.interactive)],modelname);
                                          end
                                  end
@@ -238 +238 @@
 
                          %solution name: 
-                         mpistring=[mpistring sprintf('%s ',EnumToString(solution))];
+                         mpistring=[mpistring sprintf('%s ',solution)];
 
                          %execution directory and model name: 
@@ -265 +265 @@
 
                                  %solution name: 
-                                 mpistring=[mpistring sprintf('%s ',EnumToString(solution))];
+                                 mpistring=[mpistring sprintf('%s ',solution)];
 
                                  %execution directory and model name: 

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

@@ -4 +4 @@
 import subprocess
 from fielddisplay import fielddisplay
-from EnumToString import EnumToString
 from pairoptions import pairoptions
 from issmssh import issmssh
@@ -162 +161 @@
                 fid.write('source $ISSM_DIR/etc/environment.sh\n')
                 fid.write('cd %s/%s/\n\n' % (self.executionpath,dirname))
-                fid.write('mpiexec -np %i %s/%s %s %s/%s %s\n' % (self.nprocs(),self.codepath,executable,str(EnumToString(solution)[0]),self.executionpath,dirname,modelname))
+                fid.write('mpiexec -np %i %s/%s %s %s/%s %s\n' % (self.nprocs(),self.codepath,executable,str(solution),self.executionpath,dirname,modelname))
                 
                 fid.close()

issm/trunk-jpl/src/m/classes/clusters/pollux.m

@@ -65 +65 @@
                          fprintf(fid,'cd $PBS_O_WORKDIR\n');
                          fprintf(fid,'export OMP_NUM_THREADS=1\n');
-                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                         fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
                          fclose(fid);
 

issm/trunk-jpl/src/m/classes/clusters/raijin.m

@@ -85 +85 @@
                              fprintf(fid,'module load %s\n', cluster.modules{i});
                          end
-                         fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                         fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
                          if ~io_gather, %concatenate the output files:
                                  fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);

issm/trunk-jpl/src/m/classes/clusters/vilje.m

@@ -129 +129 @@
                          fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
                          fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
-       fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+       fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
 
                          if ~io_gather, %concatenate the output files:
@@ -139 +139 @@
                          if cluster.interactive,
                                  fid=fopen([modelname '.run'],'w');
-                                 fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                                 fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
                                  if ~io_gather, %concatenate the output files:
                                          fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);

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

@@ -1 +1 @@
 import subprocess
 from fielddisplay import fielddisplay
-from EnumToString import EnumToString
 from pairoptions import pairoptions
 from issmssh import issmssh
@@ -110 +109 @@
                 fid.write('source $ISSM_DIR/etc/environment.sh\n')
                 fid.write('cd %s/%s/\n\n' % (self.executionpath,dirname))
-                fid.write('mpiexec -np %i %s/%s %s %s/%s %s\n' % (self.np,self.codepath,executable,str(EnumToString(solution)[0]),self.executionpath,dirname,modelname))
+                fid.write('mpiexec -np %i %s/%s %s %s/%s %s\n' % (self.np,self.codepath,executable,str(solution),self.executionpath,dirname,modelname))
                 fid.close()