Changeset 20571

Timestamp:

04/28/16 15:08:18 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: testing ISSM_PREFIX for jenkins

Location:

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

Files:

• generic.m (modified) (1 diff)
• greenplanet.m (modified) (2 diffs)

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

@@ -8 +8 @@
         properties (SetAccess=public) 
                 % {{{
-                name='';
-                login='';
-                np=1;
-                port=0;
-                interactive=1;
-                codepath=[issmdir() '/bin'];
-                etcpath=[issmdir() '/etc'];
-                executionpath=[issmdir() '/execution'];
-                valgrind=[issmdir() '/externalpackages/valgrind/install/bin/valgrind'];
-                valgrindlib=[issmdir() '/externalpackages/valgrind/install/lib/libmpidebug.so'];
-                valgrindsup=[issmdir() '/externalpackages/valgrind/issm.supp'];
-                verbose=1;
-                shell='/bin/sh';
+                name          = '';
+                login         = '';
+                np            = 1;
+                port          = 0;
+                interactive   = 1;
+                codepath      = [IssmConfig('ISSM_PREFIX') '/bin'];
+                etcpath       = [issmdir() '/etc'];
+                executionpath = [issmdir() '/execution'];
+                valgrind      = [issmdir() '/externalpackages/valgrind/install/bin/valgrind'];
+                valgrindlib   = [issmdir() '/externalpackages/valgrind/install/lib/libmpidebug.so'];
+                valgrindsup   = [issmdir() '/externalpackages/valgrind/issm.supp'];
+                verbose       = 1;
+                shell         = '/bin/sh';
                 %}}}
         end

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

@@ -69 +69 @@
                  end
                  %}}}
-                 function BuildKrigingQueueScript(cluster,modelname,solution,io_gather,isvalgrind,isgprof) % {{{
+                 function BuildKrigingQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof) % {{{
 
                          if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
@@ -76 +76 @@
                          %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
-                         fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,modelname);
+                         fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
                          fprintf(fid,'mpiexec -np %i %s/kriging.exe %s %s\n',cluster.np,cluster.codepath,[cluster.executionpath '/' modelname],modelname);
                          if ~io_gather, %concatenate the output files: