Changeset 12878 for issm/branches/trunk-jpl-damage/src/m/classes/clusters/castor.m

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/m/classes/clusters/castor.m (modified) (5 diffs)

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

@@ -8 +8 @@
 classdef castor
     properties (SetAccess=public) 
-                 % {{{1
+                 % {{{
                  name='castor'
                  login='username';
@@ -20 +20 @@
          end
          methods
-                 function cluster=castor(varargin) % {{{1
+                 function cluster=castor(varargin) % {{{
                          cluster=AssignObjectFields(pairoptions(varargin{:}),cluster);
                  end
                  %}}}
-                 function disp(cluster) % {{{1
+                 function disp(cluster) % {{{
                          %  display the object
                          disp(sprintf('class ''%s'' object ''%s'' = ',class(cluster),inputname(1)));
@@ -37 +37 @@
                  end
                  %}}}
-                 function checkconsistency(cluster,md,solution,analyses) % {{{1
+                 function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
                          available_queues={'shortc','longc'};
@@ -46 +46 @@
                  end
                  %}}}
-                 function BuildQueueScript(cluster,md) % {{{1
+                 function BuildQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof) % {{{
 
-                         %retrieve parameters 
-                         modelname=md.miscellaneous.name; 
-                         solution=md.private.solution;
+                         if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
+                         if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
 
-                         %open file for writing: 
+                         %write queuing script 
                          fid=fopen([modelname '.queue'],'w');
-
                          fprintf(fid,'#!/bin/sh\n');
                          fprintf(fid,'#PBS -l walltime=%i\n',cluster.time*60); %walltime is in seconds.
@@ -64 +62 @@
                          fprintf(fid,'#PBS -o %s.outlog \n',modelname);
                          fprintf(fid,'#PBS -e %s.errlog \n',modelname);
-
                          fprintf(fid,'export PBS_O_WORKDIR=%s\n',cluster.executionpath);
                          fprintf(fid,'cd $PBS_O_WORKDIR\n');
                          fprintf(fid,'export OMP_NUM_THREADS=1\n');
                          fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname);
-
-                         %close file
                          fclose(fid);
 
                  end
                  %}}}
-                 function LaunchQueueJob(cluster,md,options)% {{{1
-                         
-                         %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 '];
+                 function LaunchQueueJob(cluster,modelname,dirname,filelist)% {{{
 
-                        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);
+                         %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);
 
-                        else
-                                disp('batch mode requested: not launching job interactively');
-                                disp('launch solution sequence on remote cluster by hand');
-                        end
+                         disp('uploading input file and queueing script');
+                         issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[dirname '.tar.gz']});
 
-                 end
-                 %}}}
-                 function Download(cluster,md)% {{{1
+                         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  && qsub ' modelname '.queue '];
+                         issmssh(cluster.name,cluster.login,cluster.port,launchcommand);
+                 end %}}}
+                 function Download(cluster,dirname,filelist)% {{{
 
-                        %some check
-                        if isempty(md.private.runtimename),
-                                error('pfe Download error message: supply runtime name for results to be loaded!');
-                        end
+                         %copy files from cluster to current directory
+                         directory=[cluster.executionpath '/' dirname '/'];
+                         issmscpin(cluster.name,cluster.login,cluster.port,directory,filelist);
 
-                        %Figure out the  directory where all the files are in: 
-                        directory=[cluster.executionpath '/' md.private.runtimename '/'];
-
-                        %What packages are we picking up from remote cluster
-                        packages={[md.miscellaneous.name '.outlog'],[md.miscellaneous.name '.errlog']};
-                        if md.qmu.isdakota,
-                                packages{end+1}=[md.miscellaneous.name '.qmu.err'];
-                                packages{end+1}=[md.miscellaneous.name '.qmu.out'];
-                                if isfield(md.qmu.params,'tabular_graphics_data'),
-                                        if md.qmu.params.tabular_graphics_data==true,
-                                                packages{end+1}='dakota_tabular.dat'; 
-                                        end
-                                end
-                        else
-                                packages{end+1}=[md.miscellaneous.name '.outbin'];
-                        end
-
-                        %copy files from cluster to present directory
-                        issmscpin(cluster.name, cluster.login, cluster.port, directory, packages);
-                end %}}}
+                 end %}}}
         end
 end