Changeset 21291

Timestamp:

10/19/16 13:03:16 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed camhpc

Location:

issm/trunk-jpl/src/m/classes

Files:

• clusters/camhpc.m (modified) (6 diffs)
• organizer.m (modified) (1 diff)

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

@@ -14 +14 @@
                  cpuspernode   = 8;
                  port          = 8000;
-                 queue         = 'arnold';
+                 project       = '';
+                 partition     = '';
                  codepath      = '';
                  executionpath = '';
@@ -41 +42 @@
                          disp(sprintf('    cpuspernode: %i',cluster.cpuspernode));
                          disp(sprintf('    np: %i',cluster.cpuspernode*cluster.numnodes));
-                         disp(sprintf('    queue: %s',cluster.queue));
+                         disp(sprintf('    project: %s',cluster.project));
+                         disp(sprintf('    partition: %s',cluster.partition));
                          disp(sprintf('    codepath: %s',cluster.codepath));
                          disp(sprintf('    executionpath: %s',cluster.executionpath));
@@ -56 +58 @@
                  function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
-                         available_queues={'c6145','default'};
+                         available_queues={'ARNOLD-SL3'};
                          queue_requirements_time=[Inf Inf];
                          queue_requirements_np=[80 80];
 
-                         QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,1)
+                         QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.project,cluster.np,1)
 
                          %Miscelaneous
@@ -78 +80 @@
                          fprintf(fid,'#!/bin/bash\n');
                          fprintf(fid,'#SBATCH --job-name=%s\n',modelname);
-                         fprintf(fid,'#SBATCH -p %s \n',cluster.queue);
+                         fprintf(fid,'#SBATCH -p %s \n',cluster.partition);
+                         fprintf(fid,'#SBATCH -A %s \n',cluster.project);
                          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.
@@ -87 +90 @@
                          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,'mpirun -np %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);
@@ -96 +99 @@
                          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,'mpirun -np %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);

issm/trunk-jpl/src/m/classes/organizer.m

@@ -109 +109 @@
 
                         %figure out if the data is there, otherwise, we have to use the default path supplied by user.
-                        if exist(path,'file') | exist([path '.mat'],'file'),
+                        if exist(path,'file'),
+                                path=path;
+                        elseif exist([path '.mat'],'file'),
+                                path=[path '.mat'];
+                        else
+                                error(['Could not find ' path ]);
+                        end
+                        if exist(path,'file')
                                 evalin('caller',['load -mat ' path]);
                                 return;