Index: /issm/trunk-jpl/src/m/classes/clusters/aurora.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/aurora.m	(revision 23617)
+++ /issm/trunk-jpl/src/m/classes/clusters/aurora.m	(revision 23618)
@@ -41,4 +41,9 @@
 		 end
 		 %}}}
+		 function numprocs=np(cluster) % {{{
+			 %compute number of processors
+			 numprocs=cluster.numnodes*cluster.cpuspernode;
+		 end
+		 %}}}
 		 function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
@@ -54,4 +59,14 @@
 			 if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
 			 if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
+			 executable='issm.exe';
+			 if isdakota,
+				 version=IssmConfig('_DAKOTA_VERSION_'); version=str2num(version(1:3));
+				 if (version>=6),
+					 executable='issm_dakota.exe';
+				 end
+			 end
+			 if isoceancoupling,
+				 executable='issm_ocean.exe';
+			 end
 
 			 %write queuing script 
@@ -74,5 +89,5 @@
 			 fprintf(fid,'export PBS_O_WORKDIR=%s\n',[cluster.executionpath '/' dirname]);
 			 fprintf(fid,'cd $PBS_O_WORKDIR\n');
-			 fprintf(fid,'mpirun -n %i %s/issm.exe %s %s %s',cluster.numnodes*cluster.cpuspernode,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
+			 fprintf(fid,'mpirun -n %i %s/%s %s %s %s',cluster.np(),cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
 			 fclose(fid);
 
Index: /issm/trunk-jpl/src/m/classes/clusters/localaurora.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/localaurora.m	(revision 23617)
+++ /issm/trunk-jpl/src/m/classes/clusters/localaurora.m	(revision 23618)
@@ -41,4 +41,9 @@
 		 end
 		 %}}}
+		 function numprocs=np(cluster) % {{{
+			 %compute number of processors
+			 numprocs=cluster.numnodes*cluster.cpuspernode;
+		 end
+		 %}}}
 		 function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
@@ -54,4 +59,14 @@
 			 if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
 			 if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
+			 executable='issm.exe';
+			 if isdakota,
+				 version=IssmConfig('_DAKOTA_VERSION_'); version=str2num(version(1:3));
+				 if (version>=6),
+					 executable='issm_dakota.exe';
+				 end
+			 end
+			 if isoceancoupling,
+				 executable='issm_ocean.exe';
+			 end
 
 			 %write queuing script 
@@ -74,5 +89,5 @@
 			 fprintf(fid,'export PBS_O_WORKDIR=%s\n',[cluster.executionpath '/' dirname]);
 			 fprintf(fid,'cd $PBS_O_WORKDIR\n');
-			 fprintf(fid,'mpirun -n %i %s/issm.exe %s %s %s',cluster.numnodes*cluster.cpuspernode,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
+			 fprintf(fid,'mpirun -n %i %s/%s %s %s %s',cluster.np(),cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
 			 fclose(fid);