Changeset 12370

Timestamp:

06/05/12 10:37:08 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed download

Location:

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

Files:

• acenet.m (modified) (1 diff)
• castor.m (modified) (1 diff)
• generic.m (modified) (1 diff)
• pfe.m (modified) (2 diffs)

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

@@ -79 +79 @@
                  end
                  %}}}
-                 function LaunchQueueJob(cluster,md,options)% {{{
-                          %retrieve parameters 
-          modelname=md.miscellaneous.name;
-          solution=md.private.solution;
+                 function LaunchQueueJob(cluster,modelname,dirname,filelist)% {{{
 
-                         %lauch command, to be executed via ssh
-                         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 ' modelname '.queue '];
+                         %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);
 
-                        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
-                                system(compressstring);
-                                
-                                disp('uploading input file and queueing script');
-                                issmscpout(md.cluster.name,md.cluster.executionpath,md.cluster.login,md.cluster.port,{[md.private.runtimename '.tar.gz']});
-                                
-                                disp('launching solution sequence on remote cluster');
-                                issmssh(md.cluster.name,md.cluster.login,md.cluster.port,launchcommand);
+                         disp('uploading input file and queueing script');
+                         issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[dirname '.tar.gz']});
 
-                        else
-                                disp('batch mode requested: not launching job interactively');
-                                disp('launch solution sequence on remote cluster by hand');
-                        end
-
-                 end
-                 %}}}
+                         disp('launching solution sequence on remote cluster');
+                         launchcommand=['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);
+                 end %}}}
                  function Download(cluster,dirname,filelist)% {{{
 

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

@@ -98 +98 @@
                  end
                  %}}}
+                 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=['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);
+                 end %}}}
                  function Download(cluster,dirname,filelist)% {{{
 

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

@@ -114 +114 @@
 
                          %compress the files into one zip.
-                         compressstring=['tar -zcf ' dirname '.tar.gz ' modelname '.bin ' modelname '.queue '  modelname '.petsc '];
+                         compressstring=['tar -zcf ' dirname '.tar.gz '];
                          for i=1:numel(filelist),
                                  compressstring = [compressstring ' ' filelist{i}];

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

@@ -148 +148 @@
 
                          %compress the files into one zip.
-                         compressstring=['tar -zcf ' dirname '.tar.gz ' modelname '.bin ' modelname '.queue '  modelname '.petsc '];
+                         compressstring=['tar -zcf ' dirname '.tar.gz '];
                          for i=1:numel(filelist),
                                  compressstring = [compressstring ' ' filelist{i}];
@@ -192 +192 @@
 
                          if ~cluster.bbftp,
-                                 issmscpin(cluster.name, cluster.login, cluster.port, directory, packages);
-                         else
-                                 issmbbftpin(cluster.name, cluster.login, cluster.port, cluster.numstreams, directory, packages);
+                                 issmscpin(cluster.name,cluster.login,cluster.port,directory,filelist);
+                         else
+                                 issmbbftpin(cluster.name, cluster.login, cluster.port, cluster.numstreams, directory, filelist);
                          end