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

Last change on this file since 20498 was 20498, checked in by Mathieu Morlighem, 9 years ago

CHG: done with Archive/19101-20495
File size: 2.7 KB
RevLine 
[20498]1Index: ../trunk-jpl/src/m/classes/clusters/lonestar.m
2===================================================================
3--- ../trunk-jpl/src/m/classes/clusters/lonestar.m (revision 19955)
4+++ ../trunk-jpl/src/m/classes/clusters/lonestar.m (revision 19956)
5@@ -110,15 +110,14 @@
6 fid=fopen([modelname '.queue'],'w');
7
8 fprintf(fid,'#!/bin/bash\n');
9- fprintf(fid,'#$ -V #Inherit the submission environment \n');
10- fprintf(fid,'#$ -cwd ## Start job in submission directory \n');
11- fprintf(fid,'#$ -N %s\n',modelname);
12- fprintf(fid,'#$ -q %s \n',cluster.queue);
13- fprintf(fid,'#$ -R y\n');
14- fprintf(fid,'#$ -o %s.outlog \n',modelname);
15- fprintf(fid,'#$ -e %s.errlog \n',modelname);
16- fprintf(fid,'#$ -pe 12way %i \n',cluster.numnodes*12);
17- fprintf(fid,'#$ -l h_rt=%02i:%02i:00 \n\n',floor(cluster.time/3600),floor(mod(cluster.time,3600)/60));
18+ fprintf(fid,'#SBATCH -J %s\n',modelname);
19+ fprintf(fid,'#SBATCH -p %s \n',cluster.queue);
20+ fprintf(fid,'#SBATCH -R y\n');
21+ fprintf(fid,'#SBATCH -o %s.outlog \n',modelname);
22+ fprintf(fid,'#SBATCH -e %s.errlog \n',modelname);
23+ fprintf(fid,'#SBATCH -n %i \n',cluster.numnodes*12);
24+ fprintf(fid,'#SBATCH -N %i \n',cluster.numnodes);
25+ fprintf(fid,'#SBATCH -t %02i:%02i:00 \n\n',floor(cluster.time/3600),floor(mod(cluster.time,3600)/60));
26 for i=1:numel(cluster.modules),
27 fprintf(fid,['module load ' cluster.modules{i} '\n']);
28 end
29@@ -126,7 +125,7 @@
30 fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME
31 fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n'); %FIXME
32 fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
33- fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
34+ fprintf(fid,'ibrun -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
35 if ~io_gather, %concatenate the output files:
36 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
37 end
38@@ -135,7 +134,7 @@
39 %in interactive mode, create a run file, and errlog and outlog file
40 if cluster.interactive,
41 fid=fopen([modelname '.run'],'w');
42- fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,executable,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
43+ fprintf(fid,'ibrun -np %i %s/%s %s %s %s\n',cluster.np,executable,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
44 if ~io_gather, %concatenate the output files:
45 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
46 end
Note: See TracBrowser for help on using the repository browser.