source: issm/oecreview/Archive/20496-20544/ISSM-20535-20536.diff

Index: ../trunk-jpl/src/m/classes/clusters/generic_static.m
===================================================================
--- ../trunk-jpl/src/m/classes/clusters/generic_static.m        (revision 20535)
+++ ../trunk-jpl/src/m/classes/clusters/generic_static.m        (revision 20536)
@@ -50,10 +50,20 @@
                %}}}
                function BuildQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota) % {{{
 
+                       %write queuing script
+                       %what is the executable being called?
+                       executable='issm.exe';
+                       if isdakota,
+                               version=IssmConfig('_DAKOTA_VERSION_'); version=str2num(version(1:3));
+                               if (version>=6),
+                                       executable='issm_dakota.exe';
+                               end
+                       end
+
                        %write queuing script 
                        fid=fopen([modelname '.queue'],'w');
                        fprintf(fid,'#!%s\n',cluster.shell);
-                       fprintf(fid,[cluster.codepath '/mpiexec -np %i %s/issm.exe %s %s %s \n'],cluster.np,cluster.codepath,EnumToString(solution),'./',modelname);
+                       fprintf(fid,[cluster.codepath '/mpiexec -np %i %s/%s %s %s %s \n'],cluster.np,cluster.codepath,executable,EnumToString(solution),'./',modelname);
                        fclose(fid);
 
                        %in interactive mode, create a run file, and errlog and outlog file