Changeset 20536

Timestamp:

04/22/16 11:54:40 (9 years ago)

Author:

schlegel

Message:

CHG: add dakota 6 exec to generic_static

File:

• issm/trunk-jpl/src/m/classes/clusters/generic_static.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/clusters/generic_static.m

@@ -51 +51 @@
                 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);