Changeset 22641

Timestamp:

03/28/18 02:20:45 (7 years ago)

Author:

nsa12

Message:

CHG: adapted for migration to CSD3 Mar 18

File:

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

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

@@ -58 +58 @@
                  function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
-                         available_queues={'ARNOLD-SL3'};
+                         available_queues={'ARNOLD-SL3-CPU'}; % Updated for csd3 NSA 28/3/18
                          queue_requirements_time=[Inf Inf];
                          queue_requirements_np=[80 80];
@@ -77 +77 @@
 
                          %write queuing script 
+             disp(modelname)
                          fid=fopen([modelname '.queue'],'w');
                          fprintf(fid,'#!/bin/bash\n');
@@ -84 +85 @@
                          fprintf(fid,'#SBATCH --mail-type=ALL\n');
                          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 --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);
@@ -130 +131 @@
 
                          disp('launching solution sequence on remote cluster');
+             %
+             % qsub replaced by sbatch for csd3 system NSA 28/3/18
                          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 '];
+                                         ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz  && hostname && sbatch ' modelname '.queue '];
                          end
                          issmssh(cluster.name,cluster.login,cluster.port,launchcommand);