Changeset 25871

Timestamp:

12/14/20 14:19:01 (4 years ago)

Author:

tsantos

Message:

CHG: updating greenplanet class

File:

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

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

@@ -56 +56 @@
                  function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
-                         available_queues={'c6145','ilg2.3','default'};
-                         queue_requirements_time=[Inf Inf];
-                         queue_requirements_np=[80 80];
+                         available_queues={'brd2.4','has2.5','ilg2.3','m-c1.9','m-c2.2','nes2.8','sib2.9','m2090','default'};
+                         queue_requirements_time=[Inf Inf Inf Inf Inf Inf Inf Inf Inf];
+                         queue_requirements_np=[80 80 80 80 80 80 80 80 80];
 
                          QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,1)
@@ -103 +103 @@
                          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 --partition=%s',cluster.queue{1});
+                         for i=2:length(cluster.queue) 
+                                fprintf(fid,',%s',cluster.queue{i});
+                         end
+                         fprintf(fid,'\n');
+                         %fprintf(fid,'#SBATCH -N %i -n %i\n',cluster.numnodes,cluster.cpuspernode);
+                         %fprintf(fid,'#SBATCH --mem-per-cpu=%igb\n',cluster.memory);
+                         fprintf(fid,'#SBATCH --nodes=%i\n',cluster.numnodes); % in general, just 1
+                         fprintf(fid,'#SBATCH --ntasks=%i\n',cluster.cpuspernode); % in general, just 1
+                         fprintf(fid,'#SBATCH --cpus-per-task=%i\n',1); 
+                         fprintf(fid,'#SBATCH --mem=%igb\n',cluster.memory); % minimum total node memory required
+                         fprintf(fid,'#SBATCH --time=%s\n',datestr(cluster.time/24,'HH:MM:SS')); %walltime is in HH:MM:SS format. cluster.time is in hour
                          fprintf(fid,'#SBATCH -o %s.outlog \n',modelname);
                          fprintf(fid,'#SBATCH -e %s.errlog \n\n',modelname);