Changeset 914 for trunk


Ignore:
Timestamp:
Jun 20, 2015, 7:02:48 PM (6 years ago)
Author:
sommeria
Message:

minor change in series

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series.m

    r912 r914  
    149149    RunModeList=[RunModeList;{'cluster_oar'}];
    150150    set(handles.MonitorCluster,'Visible','on'); % make visible button for access to Monika
     151    set(handles.num_CPUTime,'Visible','on'); % make visible button for access to Monika
     152    set(handles.CPUTime_txt,'Visible','on'); % make visible button for access to Monika
    151153end
    152154[s,w]=system('qstat --version');% look for cluster system 'sge'
     
    651653        RootFile='';
    652654    else %scan the input folder
    653         [RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileInfo,MovieObject]=...
     655        [RootPath,~,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileInfo,MovieObject]=...
    654656            find_file_series(fullfile(InputTable{iview,1},InputTable{iview,2}),[InputTable{iview,3} InputTable{iview,4} InputTable{iview,5}]);
    655657    end
     
    17111713    end
    17121714end
    1713 CPUTime=5;% job time estimated at 5 min per iteration (on index i and j) by default
     1715CPUTime=1;% job time estimated at 1 min per iteration (on index i and j) by default
    17141716if isfield(Param.Action, 'CPUTime') && ~isempty(Param.Action.CPUTime)
    17151717    CPUTime=Param.Action.CPUTime;%Note: CpUTime for one iteration ref_i has to be multiplied by the number of j indices nbfield_j
     
    17221724        if isempty(Param.IndexRange.NbSlice)% if NbSlice is not defined
    17231725             BlockLength= ceil(20/(CPUTime*nbfield_j));% short iterations are grouped such that the minimum time of a process is 20 min.
    1724              BlockLength=max(BlockLength,ceil(numel(ref_i)/1000));% possibly increase the BlockLength to have less than 1000 jobs
     1726             BlockLength=max(BlockLength,ceil(numel(ref_i)/500));% possibly increase the BlockLength to have less than 500 jobs
    17251727             NbProcess=ceil(numel(ref_i)/BlockLength) ; % nbre of processes sent to oar
    17261728        else
     
    20012003            'walltime=' datestr(min(1.05*walltime_onejob/86400*max(NbProcess*BlockLength*nbfield_j,NbCore)/NbCore,max_walltime/86400),13) ' '...
    20022004            '-E ' regexprep(filename_joblist,'\.txt\>','.stderr') ' '...
    2003             '-O ' regexprep(filename_joblist,'\.txt\>','.stdout') ' '...
     2005            '-O ' regexprep(filename_joblist,'\.txt\>','.log') ' '...
    20042006            extra_oar ' '...
    20052007            '"oar-parexec -s -f ' filename_joblist ' '...
Note: See TracChangeset for help on using the changeset viewer.