Index: /issm/trunk/src/m/classes/public/BuildQueueingScriptgreenplanet.m
===================================================================
--- /issm/trunk/src/m/classes/public/BuildQueueingScriptgreenplanet.m	(revision 2496)
+++ /issm/trunk/src/m/classes/public/BuildQueueingScriptgreenplanet.m	(revision 2497)
@@ -7,16 +7,14 @@
 scriptname=[md.name '.queue'];
 
-
-
 %check queue names: 
 if strcmpi(md.cluster,'greenplanet'),
-	available_queues={'debug','shortg','longg'};
+	available_queues={'rignot','default'};
 	if  ~ismemberi(md.queue,available_queues),
-		error('BuildQueueingScriptcosmos error message: availables queues are debug, shortg and longg');
+		error('BuildQueueingScriptgreenplanet error message: availables queues are rignot and default');
 	end 
 
-	if strcmpi(md.queue,'debug'),
-		if md.np>50,
-			error('BuildQueueingScriptgreenplaneterror error message: debug queue only allows for 50 cpus max');
+	if strcmpi(md.queue,'rignot'),
+		if md.np>80,
+			error('BuildQueueingScriptgreenplaneterror error message: debug queue only allows for 80 cpus max');
 		end
 		
@@ -27,37 +25,4 @@
 end
 
-if strcmpi(md.cluster,'castor'),
-	available_queues={'shortc','longc'};
-	if  ~ismemberi(md.queue,available_queues),
-		error('BuildQueueingScriptcosmos error message: availables queues are shortc and longc');
-	end 
-end
-
-if strcmpi(md.cluster,'pollux'),
-	available_queues={'shortp','longp'};
-	if  ~ismemberi(md.queue,available_queues),
-		error('BuildQueueingScriptcosmos error message: availables queues are shortp and longp');
-	end 
-end
-
-%test parameters valid for all queues
-if strcmpi(md.queue(1:5),'short'),
-	if md.np>128,
-		error('BuildQueueingScriptcosmos error message: short queue only allows 128 cpus');
-	end
-	if md.time>180,
-		error('BuildQueueingScriptcosmos error message: short queue only allows 180 minutes');
-	end
-end
-
-if strcmpi(md.queue(1:4),'long'),
-	if md.np>128,
-		error('BuildQueueingScriptcosmos error message: long queue only allows 128 cpus');
-	end
-	if md.time>720,
-		error('BuildQueueingScriptcosmos error message: long queue only allows 720 minutes');
-	end
-end
-
 fid=fopen(scriptname,'w');
 if fid==-1,
@@ -65,17 +30,14 @@
 end
 
-fprintf(fid,'#!/bin/sh\n');
+fprintf(fid,'#!/bin/csh\n');
+fprintf(fid,'#PBS -N %s\n',md.name);
+fprintf(fid,'#PBS -l nodes=%i:ppn=%i\n',md.np/8,8);
+fprintf(fid,'#PBS -q %s\n',md.queue);
+fprintf(fid,'#PBS -m bea\n');
+fprintf(fid,'#PBS -M eric.larour@jpl.nasa.gov\n');
 fprintf(fid,'#PBS -l walltime=%i\n',md.time*60); %walltime is in seconds.
-fprintf(fid,'#PBS -l ncpus=%i\n',md.np);
-if ~isempty(md.queue),
-	fprintf(fid,'#PBS -q %s\n',md.queue);
-end
-fprintf(fid,'#PBS -o %s.outlog \n',md.name);
-fprintf(fid,'#PBS -e %s.errlog \n',md.name);
 
-fprintf(fid,'export PBS_O_WORKDIR=%s\n',executionpath);
 fprintf(fid,'cd $PBS_O_WORKDIR\n');
-fprintf(fid,'export OMP_NUM_THREADS=1\n');
-fprintf(fid,'dplace -s1 -c0-%i mpirun -np %i %s/%s.exe %s %s.bin %s.outbin %s.lock',md.np-1,md.np,codepath,AnalysisTypeFromEnum(md.analysis_type),executionpath,md.name,md.name,md.name);
+fprintf(fid,'mpirun -machinefile $PBS_NODEFILE -np %i %s/%s.exe %s %s.bin %s.outbin %s.lock > %s.outlog',md.np,codepath,AnalysisTypeFromEnum(md.analysis_type),executionpath,md.name,md.name,md.name,md.name);
 
 fclose(fid);
Index: /issm/trunk/src/m/classes/public/LaunchQueueJobgemini.m
===================================================================
--- /issm/trunk/src/m/classes/public/LaunchQueueJobgemini.m	(revision 2496)
+++ /issm/trunk/src/m/classes/public/LaunchQueueJobgemini.m	(revision 2497)
@@ -22,9 +22,12 @@
 		eval(['!scp ' md.name '.bin' ' ' md.name '.queue '  md.cluster ':' executionpath]);
 	end
+	
+	disp('launching solution sequence on remote cluster');
+	issmssh(md.cluster,['"cd ' executionpath ' && qsub ' md.name '.queue "']);
 else
 	disp('batch mode requested: not launching job interactively');
+
+	%new gemini cannot launch across cluster using ssh
+	disp(['launch solution sequence on remote cluster by logging into it and typing qsub < ' md.name '.queue']);
 end
-
-%new gemini cannot launch across cluster using ssh
-disp(['launch solution sequence on remote cluster by logging into it and typing qsub < ' md.name '.queue']);
-md.waitonlock=0;
+md.waitonlock=0; %cannot wait for lock
Index: /issm/trunk/src/m/classes/public/qstat.m
===================================================================
--- /issm/trunk/src/m/classes/public/qstat.m	(revision 2497)
+++ /issm/trunk/src/m/classes/public/qstat.m	(revision 2497)
@@ -0,0 +1,8 @@
+function qstat(md)
+%QSTAT - ...
+%
+%   Usage:
+%      qstat(md)
+
+%run qstat command on remote cluster
+issmssh(md.cluster,['qstat -a']);