Changeset 18703

Timestamp:

10/28/14 17:30:52 (10 years ago)

Author:

schlegel

Message:

CHG: don't specify general queue

File:

• issm/trunk-jpl/src/m/classes/clusters/discover.m (modified) (3 diffs)

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

@@ -64 +64 @@
                          QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,cluster.time)
 
-                         if ( strcmpi(cluster.queue,'general') & cluster.cpuspernode*cluster.numnodes < 17)
-                                 md = checkmessage(md,'cpus must be greater than 17 for general queue');
-                         end
                          %now, check cluster.cpuspernode according to processor type
-                         if ( strcmpi(cluster.processor,'neha')),
-                                 if ((cluster.cpuspernode>8 ) | (cluster.cpuspernode<1)),
-                                         md = checkmessage(md,'cpuspernode should be between 1 and 8 for ''neha'' processors');
+                         if ( strcmpi(cluster.processor,'sand')),
+                                 if ((cluster.cpuspernode>16 ) | (cluster.cpuspernode<1)),
+                                         md = checkmessage(md,'cpuspernode should be between 1 and 16 for ''sand'' processors');
                                  end
                          elseif strcmpi(cluster.processor,'west'),
@@ -77 +74 @@
                                  end
                          else
-                                 md = checkmessage(md,'unknown processor type, should be ''neha'' or ''west'' ');
+                                 md = checkmessage(md,'unknown processor type, should be ''sand'' or ''west'' ');
                          end
 
@@ -100 +97 @@
                          fprintf(fid,'#PBS -l select=%i:mpiprocs=%i:proc=%s\n',cluster.numnodes,cluster.cpuspernode,cluster.processor);
                          fprintf(fid,'#PBS -l walltime=%i:00\n',cluster.time); %SLURM walltime is in minutes:
-                         fprintf(fid,'#PBS -q %s \n',cluster.queue);
+                         if ~strcmp(cluster.queue,'general'),
+                                 fprintf(fid,'#PBS -q %s \n',cluster.queue);
+                         end
                          fprintf(fid,'#PBS -W group_list=s1010\n');
                          fprintf(fid,'#PBS -m e\n');