Changeset 20500 for issm/trunk/src/m/classes/clusters/greenplanet.m

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/clusters/greenplanet.m (modified) (6 diffs)

issm/trunk

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

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

@@ -21 +21 @@
                  memory        = 2;
          end
-         properties (SetAccess=private) 
-                 np=20*8;
-                 % }}}
-         end
+         %}}}
          methods
                  function cluster=greenplanet(varargin) % {{{
@@ -52 +49 @@
                  end
                  %}}}
+                 function numprocs=np(cluster) % {{{
+                         %compute number of processors
+                         numprocs=cluster.numnodes*cluster.cpuspernode;
+                 end
+                 %}}}
                  function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
@@ -71 +73 @@
                          if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
                          if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
-
-                         %compute number of processors
-                         cluster.np=cluster.numnodes*cluster.cpuspernode;
 
                          %write queuing script 
@@ -97 +96 @@
                  end
                  %}}}
-                 function BuildQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof) % {{{
+                 function BuildQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota) % {{{
 
                          if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
                          if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
 
-                         %compute number of processors
-                         cluster.np=cluster.numnodes*cluster.cpuspernode;
-
                          %write queuing script 
                          fid=fopen([modelname '.queue'],'w');
-                         fprintf(fid,'#PBS -S /bin/bash\n');
-                         fprintf(fid,'#PBS -N %s\n',modelname);
-                         fprintf(fid,'#PBS -q %s \n',cluster.queue);
-                         fprintf(fid,'#PBS -l nodes=%i:ppn=%i\n',cluster.numnodes, ...
-                                                         cluster.cpuspernode);
-                         fprintf(fid,'#PBS -l walltime=%i\n',cluster.time*60); %walltime is in seconds.
-                         fprintf(fid,'#PBS -l mem=%igb\n',cluster.memory);
-                         fprintf(fid,'#PBS -m bea\n');
-                         fprintf(fid,'#PBS -M mmorligh@uci.edu\n');
-                         fprintf(fid,'#PBS -o %s.outlog \n',modelname);
-                         fprintf(fid,'#PBS -e %s.errlog \n\n',modelname);
+                         fprintf(fid,'#!/bin/bash\n');
+                         fprintf(fid,'#SBATCH --job-name=%s\n',modelname);
+                         fprintf(fid,'#SBATCH -p %s \n',cluster.queue);
+                         fprintf(fid,'#SBATCH -N %i -n %i\n',cluster.numnodes,cluster.cpuspernode);
+                         fprintf(fid,'#SBATCH --time=%i\n',cluster.time*60); %walltime is in seconds.
+                         fprintf(fid,'#SBATCH --mem-per-cpu=%igb\n',cluster.memory);
+                         fprintf(fid,'#SBATCH -o %s.outlog \n',modelname);
+                         fprintf(fid,'#SBATCH -e %s.errlog \n\n',modelname);
                          fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME
                          fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
@@ -141 +134 @@
                          end
                  end %}}}
-                 function LaunchQueueJob(cluster,modelname,dirname,filelist)% {{{
+                 function UploadQueueJob(cluster,modelname,dirname,filelist)% {{{
 
                          %compress the files into one zip.
@@ -156 +149 @@
                          issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[dirname '.tar.gz']});
 
+                 end %}}}
+                 function LaunchQueueJob(cluster,modelname,dirname,filelist,restart)% {{{
+
                          disp('launching solution sequence on remote cluster');
-                          launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
-                                                                                         ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz  && hostname && qsub ' modelname '.queue '];
+                         if ~isempty(restart)
+                                 launchcommand=['cd ' cluster.executionpath ' && cd ' dirname ' && hostname && qsub ' 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 '];
+                         end
                          issmssh(cluster.name,cluster.login,cluster.port,launchcommand);
                  end %}}}

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad