Index: ../trunk-jpl/src/m/classes/clusters/discover.m
===================================================================
--- ../trunk-jpl/src/m/classes/clusters/discover.m	(revision 18702)
+++ ../trunk-jpl/src/m/classes/clusters/discover.m	(revision 18703)
@@ -63,20 +63,17 @@
 
 			 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'),
 				 if ((cluster.cpuspernode>12 ) | (cluster.cpuspernode<1)),
 					 md = checkmessage(md,'cpuspernode should be between 1 and 12 for ''west'' processors');
 				 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
 
 			 %Miscelaneous
@@ -99,7 +96,9 @@
 %			 fprintf(fid,'#PBS -N %s\n',modelname);
 			 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');
 			 fprintf(fid,'#PBS -o %s.outlog \n',[cluster.executionpath '/' dirname '/' modelname]);
