Changeset 25018

Timestamp:

06/11/20 16:45:23 (5 years ago)

Author:

schlegel

Message:

CHG: update calls for mpt in discover

File:

• issm/trunk-jpl/src/m/classes/clusters/discover.m (modified) (4 diffs)

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

@@ -125 +125 @@
                          end
                          fprintf(fid,'. /usr/share/modules/init/bash\n\n');
-                         fprintf(fid,'module load comp/intel-16.0.2.181\n');
-                         fprintf(fid,'module load mpi/impi-5.1.3.181\n');
-                         fprintf(fid,'module load other/cmake-3.8.2\n');
+                         fprintf(fid,'module load comp/intel/20.0.0.166\n');
+                         fprintf(fid,'module load mpi/sgi-mpt/2.17\n');
+                         fprintf(fid,'module load cmake/3.17.0\n');
                          fprintf(fid,'export MPI_GROUP_MAX=64\n\n');
                          fprintf(fid,'export MPI_UNBUFFERED_STDIO=true\n\n');
@@ -135 +135 @@
                          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,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:
                                  fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
@@ -145 +145 @@
                                  fid=fopen([modelname '.run'],'w');
                                  if ~isvalgrind,
-                                         fprintf(fid,'mpirun -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,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,'mpirun -np %i valgrind --leak-check=full %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
+                                         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:
@@ -190 +190 @@
                          if ~cluster.interactive, 
                                  if ~isempty(restart)
-                                         launchcommand=['cd ' cluster.executionpath ' && cd ' dirname ' && qsub ' modelname '.queue '];
+                                         launchcommand=['cd ' cluster.executionpath ' && cd ' dirname ' && sbatch ' modelname '.queue '];
                                  else
                                          launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
-                                                 ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz  && qsub ' modelname '.queue '];
+                                                 ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz  && sbatch ' modelname '.queue '];
                                  end
                          else