Index: /issm/trunk/src/m/classes/public/queue/ClusterScript.m
===================================================================
--- /issm/trunk/src/m/classes/public/queue/ClusterScript.m	(revision 4828)
+++ /issm/trunk/src/m/classes/public/queue/ClusterScript.m	(revision 4829)
@@ -7,10 +7,6 @@
 global ISSM_DIR;
 
+if strcmpi(cluster,'cosmos'), % {{{1
 
-if strcmpi(cluster,'cosmos'),
-
-
-
-	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%cosmos%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	fprintf(fid,'#!/bin/bash\n');
 	fprintf(fid,'#PBS -l select=%i:ncpus=1\n',np);
@@ -25,15 +21,8 @@
 	fprintf(fid,'ulimit -c 0\n');
 	fprintf(fid,'/opt/mpich/gm/intel10.1/bin/mpirun -np %i %s/issm.exe %s %s %s.bin %s.outbin %s.lock',np,codepath,EnumAsString(analysis_type),executionpath,name,name,name);
-	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+	% }}}
+elseif (strcmpi(cluster,'astrid') | strcmpi(cluster,'larsen') | strcmpi(cluster,'wilkes')), % {{{
 
-
-
-elseif (strcmpi(cluster,'astrid') | strcmpi(cluster,'larsen') | strcmpi(cluster,'wilkes')),
-
-
-
-
-	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%astrid%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	fprintf(fid,'#!/bin/sh\n');
 	fprintf(fid,'rm -rf %s/%s.lock\n',executionpath,name);
@@ -44,14 +33,9 @@
 		fprintf(fid,'LD_PRELOAD=%s mpirun -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s.bin %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',[ISSM_DIR '/externalpackages/valgrind/install/lib/libmpidebug.so'],np,[ISSM_DIR '/externalpackages/valgrind/install/bin/valgrind'],[ISSM_DIR '/externalpackages/valgrind/issm.supp'], codepath,EnumAsString(analysis_type),executionpath,name,name,name,name,name);
 	end
-	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+	% }}}
+elseif (strcmpi(cluster,'gemini') | strcmpi(cluster,'pollux') | strcmpi(cluster,'castor')), % {{{1
 
-
-
-
-elseif (strcmpi(cluster,'gemini') | strcmpi(cluster,'pollux') | strcmpi(cluster,'castor')),
-
-	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%gemini%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-fprintf(fid,'#!/bin/sh\n');
+	fprintf(fid,'#!/bin/sh\n');
 	fprintf(fid,'#PBS -l walltime=%i\n',time*60); %walltime is in seconds.
 	fprintf(fid,'#PBS -l ncpus=%i\n',np);
@@ -66,12 +50,8 @@
 	fprintf(fid,'export OMP_NUM_THREADS=1\n');
 	fprintf(fid,'dplace -s1 -c0-%i mpirun -np %i %s/issm.exe %s %s %s.bin %s.outbin %s.lock',np-1,np,codepath,EnumAsString(analysis_type),executionpath,name,name,name);
-	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+	% }}}
+elseif strcmpi(cluster,'pfe'), % {{{1
 
-
-elseif strcmpi(cluster,'pfe'),
-
-
-	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%pfe%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	fprintf(fid,'#PBS -S /bin/bash\n');
 	fprintf(fid,'#PBS -N %s\n',name);
@@ -94,8 +74,8 @@
 
 	fprintf(fid,'mpiexec -verbose -np %i %s/%s.exe $PBS_O_WORKDIR %s.bin %s.outbin %s.lock',np,codepath,EnumAsString(analysis_type),name,name,name);
-	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
-else
+	% }}}
+else % {{{1
 	error(['ClusterScript error message: could not find settings for cluster ' cluster]);
 end
+% }}}