Changeset 15093

Timestamp:

05/23/13 23:16:00 (12 years ago)

Author:

Eric.Larour

Message:

CHG: generic again capable of running on windows platforms

File:

• issm/trunk-jpl/src/m/classes/clusters/generic.m (modified) (2 diffs)

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

@@ -115 +115 @@
                                 fprintf(fid,'@echo off\n');
                                 if cluster.interactive
-                                        fprintf(fid,'"%s/issm.exe" %s "%s" %s ',cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
-                                else
-                                        fprintf(fid,'"%s/issm.exe" %s "%s" %s 2> %s.errlog >%s.outlog',...
-                                                cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname,modelname,modelname);
+                                        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);
@@ -178 +178 @@
                 function LaunchQueueJob(cluster,modelname,dirname,filelist)% {{{
 
-                        %compress the files into one zip.
-                        compressstring=['tar -zcf ' dirname '.tar.gz '];
-                        for i=1:numel(filelist),
-                                compressstring = [compressstring ' ' filelist{i}];
-                        end
-                        if cluster.interactive,
-                                compressstring = [compressstring ' ' modelname '.errlog ' modelname '.outlog '];
-                        end
-                        system(compressstring);
-
-                        disp('uploading input file and queueing script');
-                        issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[dirname '.tar.gz']});
-
-                        disp('launching solution sequence on remote cluster');
-                        launchcommand=['source ' cluster.etcpath '/environment.sh && cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
-                                ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz  && source  ' modelname '.queue '];
-                        issmssh(cluster.name,cluster.login,cluster.port,launchcommand);
+                        if ~ispc,
+                                %compress the files into one zip.
+                                compressstring=['tar -zcf ' dirname '.tar.gz '];
+                                for i=1:numel(filelist),
+                                        compressstring = [compressstring ' ' filelist{i}];
+                                end
+                                if cluster.interactive,
+                                        compressstring = [compressstring ' ' modelname '.errlog ' modelname '.outlog '];
+                                end
+                                system(compressstring);
+
+                                disp('uploading input file and queueing script');
+                                issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[dirname '.tar.gz']});
+
+                                disp('launching solution sequence on remote cluster');
+                                launchcommand=['source ' cluster.etcpath '/environment.sh && cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
+                                        ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz  && source  ' modelname '.queue '];
+                                issmssh(cluster.name,cluster.login,cluster.port,launchcommand);
+                        else
+                                system([modelname '.bat']);
+                        end
                 end %}}}
                 function Download(cluster,dirname,filelist)% {{{