Index: /issm/trunk-jpl/src/m/classes/clusters/discover.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/discover.m	(revision 12620)
+++ /issm/trunk-jpl/src/m/classes/clusters/discover.m	(revision 12621)
@@ -14,5 +14,5 @@
 		 cpuspernode=8; 
 		 port=1025;
-		 queue='long';
+		 queue='general';
 		 time=12*60;
 		 processor='west';
@@ -64,4 +64,7 @@
 			 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)
+				 checkmessage('cpus must be great than 17 for general queue');
+			 end
 			 %now, check cluster.cpuspernode according to processor type
 			 if ( strcmpi(cluster.processor,'neha')),