Changeset 15121

Timestamp:

05/26/13 23:23:24 (12 years ago)

Author:

Eric.Larour

Message:

CHG: update generic class to handle runs in parallel on windows platforms.
Also updated oshostname, which on windows dependended on the presence of sed, which
is not guaranteed.
Update solve.m list of files needed for the windows runs.

Location:

issm/trunk-jpl/src/m

Files:

• classes/clusters/generic.m (modified) (1 diff)
• os/oshostname.m (modified) (1 diff)
• solve/solve.m (modified) (1 diff)

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

@@ -114 +114 @@
                                 fid=fopen([modelname '.bat'],'w');
                                 fprintf(fid,'@echo off\n');
-                                if cluster.interactive
+
+                                if cluster.np>1,
+                                        fprintf(fid,'"C:\\Program Files\\MPICH2\\bin\\mpiexec.exe" -n %i "%s/issm.exe" %s ./ %s ',cluster.np,cluster.codepath,EnumToString(solution),modelname);
+                                else
                                         fprintf(fid,'"%s/issm.exe" %s ./ %s ',cluster.codepath,EnumToString(solution),modelname);
-                                else
-                                        fprintf(fid,'"%s/issm.exe" %s ./ %s 2> %s.errlog >%s.outlog',...
-                                                cluster.codepath,EnumToString(solution),modelname,modelname,modelname);
                                 end
                                 fclose(fid);

issm/trunk-jpl/src/m/os/oshostname.m

@@ -7 +7 @@
 
 if ispc(),
-        [status,hostname]=system('hostname | sed ''s/-//g''');
+        [status,hostname]=system('hostname');
         if status, 
                 error('oshostname error message: could not run hostname command on windows os');

issm/trunk-jpl/src/m/solve/solve.m

@@ -82 +82 @@
 %Launch job
 modelname = md.miscellaneous.name;
-filelist  = {[modelname '.bin '] [modelname '.toolkits '] [modelname '.queue ']};
+filelist  = {[modelname '.bin '] [modelname '.toolkits ']};
+if ispc,
+        filelist{end+1}=[modelname '.bat '];
+else
+        filelist{end+1}=[modelname '.queue '];
+end
+
 if md.qmu.isdakota,
         filelist{end+1} = [modelname '.qmu.in'];