source: issm/oecreview/Archive/19101-20495/ISSM-19955-19956.diff@ 20498

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

@@ -110 +110 @@
                          fid=fopen([modelname '.queue'],'w');
 
                          fprintf(fid,'#!/bin/bash\n');
-                         fprintf(fid,'#$ -V #Inherit the submission environment \n');
-                         fprintf(fid,'#$ -cwd ## Start job in submission directory \n');
-                         fprintf(fid,'#$ -N %s\n',modelname);
-                         fprintf(fid,'#$ -q %s \n',cluster.queue);
-                         fprintf(fid,'#$ -R y\n');
-                         fprintf(fid,'#$ -o %s.outlog \n',modelname);
-                         fprintf(fid,'#$ -e %s.errlog \n',modelname);
-                         fprintf(fid,'#$ -pe 12way %i \n',cluster.numnodes*12);
-                         fprintf(fid,'#$ -l h_rt=%02i:%02i:00 \n\n',floor(cluster.time/3600),floor(mod(cluster.time,3600)/60));
+                         fprintf(fid,'#SBATCH -J %s\n',modelname);
+                         fprintf(fid,'#SBATCH -p %s \n',cluster.queue);
+                         fprintf(fid,'#SBATCH -R y\n');
+                         fprintf(fid,'#SBATCH -o %s.outlog \n',modelname);
+                         fprintf(fid,'#SBATCH -e %s.errlog \n',modelname);
+                         fprintf(fid,'#SBATCH -n %i \n',cluster.numnodes*12);
+                         fprintf(fid,'#SBATCH -N %i \n',cluster.numnodes);
+                         fprintf(fid,'#SBATCH -t %02i:%02i:00 \n\n',floor(cluster.time/3600),floor(mod(cluster.time,3600)/60));
                          for i=1:numel(cluster.modules),
                                  fprintf(fid,['module load ' cluster.modules{i} '\n']);
                          end
@@ -126 +125 @@
                          fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME
                          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,'ibrun -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
                          if ~io_gather, %concatenate the output files:
                                  fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
                          end
@@ -135 +134 @@
                          %in interactive mode, create a run file, and errlog and outlog file
                          if cluster.interactive,
                                  fid=fopen([modelname '.run'],'w');
-                                 fprintf(fid,'mpiexec -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,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
                                  if ~io_gather, %concatenate the output files:
                                          fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
                                  end