Changeset 914

Timestamp:

Jun 20, 2015, 7:02:48 PM (9 years ago)

Author:

sommeria

Message:

minor change in series

Location:

trunk/src

Files:

• series.fig (modified) (previous)
• series.m (modified) (5 diffs)

trunk/src/series.m

@@ -149 +149 @@
     RunModeList=[RunModeList;{'cluster_oar'}];
     set(handles.MonitorCluster,'Visible','on'); % make visible button for access to Monika
+    set(handles.num_CPUTime,'Visible','on'); % make visible button for access to Monika
+    set(handles.CPUTime_txt,'Visible','on'); % make visible button for access to Monika
 end
 [s,w]=system('qstat --version');% look for cluster system 'sge'
@@ -651 +653 @@
         RootFile='';
     else %scan the input folder
-        [RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileInfo,MovieObject]=...
+        [RootPath,~,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileInfo,MovieObject]=...
             find_file_series(fullfile(InputTable{iview,1},InputTable{iview,2}),[InputTable{iview,3} InputTable{iview,4} InputTable{iview,5}]);
     end
@@ -1711 +1713 @@
     end
 end
-CPUTime=5;% job time estimated at 5 min per iteration (on index i and j) by default
+CPUTime=1;% job time estimated at 1 min per iteration (on index i and j) by default
 if isfield(Param.Action, 'CPUTime') && ~isempty(Param.Action.CPUTime)
     CPUTime=Param.Action.CPUTime;%Note: CpUTime for one iteration ref_i has to be multiplied by the number of j indices nbfield_j
@@ -1722 +1724 @@
         if isempty(Param.IndexRange.NbSlice)% if NbSlice is not defined
              BlockLength= ceil(20/(CPUTime*nbfield_j));% short iterations are grouped such that the minimum time of a process is 20 min.
-             BlockLength=max(BlockLength,ceil(numel(ref_i)/1000));% possibly increase the BlockLength to have less than 1000 jobs
+             BlockLength=max(BlockLength,ceil(numel(ref_i)/500));% possibly increase the BlockLength to have less than 500 jobs
              NbProcess=ceil(numel(ref_i)/BlockLength) ; % nbre of processes sent to oar
         else
@@ -2001 +2003 @@
             'walltime=' datestr(min(1.05*walltime_onejob/86400*max(NbProcess*BlockLength*nbfield_j,NbCore)/NbCore,max_walltime/86400),13) ' '...
             '-E ' regexprep(filename_joblist,'\.txt\>','.stderr') ' '...
-            '-O ' regexprep(filename_joblist,'\.txt\>','.stdout') ' '...
+            '-O ' regexprep(filename_joblist,'\.txt\>','.log') ' '...
             extra_oar ' '...
             '"oar-parexec -s -f ' filename_joblist ' '...