Changeset 7984

Timestamp:

04/19/11 15:03:12 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added interactive runs for larsen and astrid

Location:

issm/trunk/src/m

Files:

• classes/clusters/astrid.m (modified) (4 diffs)
• classes/clusters/larsen.m (modified) (4 diffs)
• model/waitonlock.m (modified) (1 diff)

issm/trunk/src/m/classes/clusters/astrid.m

@@ -13 +13 @@
                  np=15;
                  port=0;
+                 interactive=1;
                  codepath=[issmtier() '/bin'];
                  executionpath=[issmdir() '/execution'];
@@ -76 +77 @@
                          fprintf(fid,'#!/bin/sh\n');
                          if mem_debug==0,
-                                 fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock  2> %s.errlog >%s.outlog ',cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,modelname,modelname);
+                                 if cluster.interactive
+                                         fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock ',...
+                                                 cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname);
+                                 else
+                                         fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock  2> %s.errlog >%s.outlog ',...
+                                                 cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,modelname,modelname);
+                                 end
                          else
                                  %fprintf(fid,'LD_PRELOAD=%s mpirun -np %i %s --leak-check=full --gen-suppressions=all --suppressions=%s %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock  2> %s.errlog >%s.outlog ',cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,modelname,modelname);
-                                 fprintf(fid,'LD_PRELOAD=%s mpirun -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock  2> %s.errlog >%s.outlog ',cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup, cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,modelname,modelname);
+                                 fprintf(fid,'LD_PRELOAD=%s mpirun -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock  2> %s.errlog >%s.outlog ',...
+                                         cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup, cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,modelname,modelname);
                          end
 
@@ -91 +99 @@
                          end
 
-                         %close file
-                         fclose(fid);
+                         %in interactive mode, create a run file, and errlog and outlog file
+                         if cluster.interactive,
+                                 fid=fopen([modelname '.errlog'],'w'); fclose(fid);
+                                 fid=fopen([modelname '.outlog'],'w'); fclose(fid);
+                         end
 
                  end
@@ -108 +119 @@
                                 if md.qmu_analysis,
                                         compressstring=[compressstring md.name '.qmu.in'];
+                                end
+                                if cluster.interactive,
+                                        compressstring=[compressstring ' ' md.name '.errlog ' md.name '.outlog '];
                                 end
                                 system(compressstring);

issm/trunk/src/m/classes/clusters/larsen.m

@@ -13 +13 @@
                  np=7;
                  port=0;
+                 interactive=1;
                  codepath=[issmtier() '/bin'];
                  executionpath=[issmdir() '/execution'];
@@ -70 +71 @@
                          fprintf(fid,'#!/bin/sh\n');
                          if mem_debug==0,
-                                 fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,modelname,modelname);
+                                 if cluster.interactive
+                                         fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock',...
+                                                 cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,);
+                                 else
+                                         fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',...
+                                                 cluster.np,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,modelname,modelname);
+                                 end
                          else
                                  %fprintf(fid,'LD_PRELOAD=%s mpirun -np %i %s --leak-check=full --gen-suppressions=all --suppressions=%s %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,modelname,modelname);
-                                 fprintf(fid,'LD_PRELOAD=%s mpirun -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup, cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,modelname,modelname);
+                                 fprintf(fid,'LD_PRELOAD=%s mpirun -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s.bin %s.petsc %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',...
+                                         cluster.valgrindlib,cluster.np,cluster.valgrind,cluster.valgrindsup, cluster.codepath,EnumToString(solution_type),cluster.executionpath,modelname,modelname,modelname,modelname,modelname,modelname);
                          end
 
@@ -79 +87 @@
                                  fprintf(fid,'\n gprof %s/issm.exe gmon.out > %s.performance',cluster.codepath,modelname);
                          end 
-
-                         %close file
                          fclose(fid);
 
+                         %in interactive mode, create a run file, and errlog and outlog file
+                         if cluster.interactive,
+                                 fid=fopen([modelname '.errlog'],'w'); fclose(fid);
+                                 fid=fopen([modelname '.outlog'],'w'); fclose(fid);
+                         end
                  end
                  %}}}
@@ -97 +108 @@
                                 if md.qmu_analysis,
                                         compressstring=[compressstring md.name '.qmu.in'];
+                                end
+                                if cluster.interactive,
+                                        compressstring=[compressstring ' ' md.name '.errlog ' md.name '.outlog '];
                                 end
                                 system(compressstring);

issm/trunk/src/m/model/waitonlock.m

@@ -31 +31 @@
 else
 
+        if ismember('interactive',properties(md.cluster)) & md.cluster.interactive
+                %We are in interactive mode, no need to check for job completion
+                flag=1;
+                return;
+        end
         %initialize time and file presence test flag
         time=0; ispresent=0;