Changeset 20548 for issm/trunk/src/m/classes/clusters/generic_static.m

Timestamp:

04/25/16 10:08:11 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20546

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/clusters/generic_static.m (modified) (1 diff)

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

@@ -51 +51 @@
                 function BuildQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota) % {{{
 
+                        %Check that issm.exe exists in the right path
+                        if ~exist([cluster.codepath '/issm.exe'],'file'),
+                                error(['File ' cluster.codepath '/issm.exe does not exist']);
+                        end
+
+                        %Now process codepath and replace empty spaces with \ to avoid errors in queuing script
+                        codepath2=strrep(cluster.codepath,' ','\ ');
+
+                        %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,['%s/mpiexec -np %i %s/%s %s %s %s \n'],codepath2,cluster.np,codepath2,executable,EnumToString(solution),'./',modelname);
                         fclose(fid);