Changeset 23894

Timestamp:

04/25/19 10:23:21 (6 years ago)

Author:

tsantos

Message:

CHG: updating some commands in cluster/greenplanet.m

File:

• issm/trunk-jpl/src/m/classes/clusters/greenplanet.m (modified) (5 diffs)

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

@@ -56 +56 @@
                  function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
-                         available_queues={'c6145','default'};
+                         available_queues={'c6145','ilg2.3','default'};
                          queue_requirements_time=[Inf Inf];
                          queue_requirements_np=[80 80];
@@ -94 +94 @@
                  end
                  %}}}
-                 function BuildQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota) % {{{
+                 function BuildQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota,isoceancoupling) % {{{
 
                          if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
@@ -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,solution,[cluster.executionpath '/' dirname],modelname);
+                         fprintf(fid,'mpiexec -n %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,solution,[cluster.executionpath '/' dirname],modelname);
+                                 fprintf(fid,'mpiexec -n %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);
@@ -152 +152 @@
                          disp('launching solution sequence on remote cluster');
                          if ~isempty(restart)
-                                 launchcommand=['cd ' cluster.executionpath ' && cd ' dirname ' && hostname && qsub ' modelname '.queue '];
+                                 launchcommand=['cd ' cluster.executionpath ' && cd ' dirname ' && hostname && sbatch ' modelname '.queue '];
                          else
                                  launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
-                                         ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz  && hostname && qsub ' modelname '.queue '];
+                                         ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz  && hostname && sbatch ' modelname '.queue '];
                          end
                          issmssh(cluster.name,cluster.login,cluster.port,launchcommand);