Changeset 12369

Timestamp:

06/05/12 10:28:30 (13 years ago)

Author:

Mathieu Morlighem

Message:

updated pfe

File:

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

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

@@ -145 +145 @@
                          end
                  end %}}}
-                 function LaunchQueueJob(cluster,md,options)% {{{
-                         
+                 function LaunchQueueJob(cluster,modelname,dirname,filelist)% {{{
+
+                         %compress the files into one zip.
+                         compressstring=['tar -zcf ' dirname '.tar.gz ' modelname '.bin ' modelname '.queue '  modelname '.petsc '];
+                         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');
+                         if cluster.interactive,
+                                 directory=[cluster.executionpath '/Interactive' num2str(cluster.interactive)];
+                         else 
+                                 directory=cluster.executionpath;
+                         end
+
+                         if ~cluster.bbftp,
+                                 issmscpout(cluster.name,directory,cluster.login,cluster.port,{[dirname '.tar.gz']});
+                         else
+                                 issmbbftpout(cluster.name,directory,cluster.login,cluster.port,cluster.numstreams,{[dirname '.tar.gz']});
+                         end
+
                          %lauch command, to be executed via ssh
                          if ~cluster.interactive, 
-                                launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ...
-                                        ' && cd ' md.private.runtimename ' && mv ../' md.private.runtimename '.tar.gz ./ && tar -zxf ' md.private.runtimename '.tar.gz  && qsub ' md.miscellaneous.name '.queue '];
-                        else
-                                launchcommand=['cd ' cluster.executionpath '/Interactive' num2str(cluster.interactive) ' && tar -zxf ' md.private.runtimename '.tar.gz'];
-                        end
-
-                        if ~strcmpi(options.batch,'yes'),
-                                
-                                %compress the files into one zip.
-                                compressstring=['tar -zcf ' md.private.runtimename '.tar.gz ' md.miscellaneous.name '.bin ' md.miscellaneous.name '.queue '  md.miscellaneous.name '.petsc '];
-                                if md.qmu.isdakota,
-                                        compressstring=[compressstring md.miscellaneous.name '.qmu.in '];
-                                end
-                                if cluster.interactive,
-                                        compressstring=[compressstring md.miscellaneous.name '.run ' md.miscellaneous.name '.errlog ' md.miscellaneous.name '.outlog '];
-                                end
-                                system(compressstring);
-                                
-                                disp('uploading input file and queueing script');
-                                if cluster.interactive,
-                                        directory=[cluster.executionpath '/Interactive' num2str(cluster.interactive)];
-                                else 
-                                        directory=cluster.executionpath;
-                                end
-                                
-                                if ~cluster.bbftp,
-                                        issmscpout(cluster.name,directory,cluster.login,cluster.port,{[md.private.runtimename '.tar.gz']});
-                                else
-                                        issmbbftpout(cluster.name,directory,cluster.login,cluster.port,cluster.numstreams,{[md.private.runtimename '.tar.gz']});
-                                end
-                                
-                                disp('launching solution sequence on remote cluster');
-                                issmssh(cluster.name,cluster.login,cluster.port,launchcommand);
-
-                        else
-                                disp('batch mode requested: not launching job interactively');
-                                disp('launch solution sequence on remote cluster by hand');
-                        end
+                                 launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
+                                         ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz  && qsub ' modelname '.queue '];
+                         else
+                                 launchcommand=['cd ' cluster.executionpath '/Interactive' num2str(cluster.interactive) ' && tar -zxf ' dirname '.tar.gz'];
+                         end
+
+                         disp('launching solution sequence on remote cluster');
+                         issmssh(cluster.name,cluster.login,cluster.port,launchcommand);
                  end
                  %}}}