Changeset 897 for trunk/src/series.m

Timestamp:

May 25, 2015, 8:48:58 PM (10 years ago)

Author:

sommeria

Message:

sub_background corrected for volume and multilevel cases

File:

• trunk/src/series.m (modified) (17 diffs)

trunk/src/series.m

@@ -1556 +1556 @@
 end
 
-%% set nbre of cluster cores and processes
+%% set nbre of cluster cores and processes: 
+% NbCore is the number of computer processors used 
+% NbProcess is the number of independent processes in which the required calculation is split
 switch RunMode
     case {'local','background'}
@@ -1598 +1600 @@
 end
 if isempty(Param.IndexRange.NbSlice)
-    NbProcess=NbCore;% choose one process per core
+    NbProcess=NbCore;% choose one process per core if NbSlice is not imposed
 else
-    NbProcess=Param.IndexRange.NbSlice;% the nbre of run processes is equal to the number of slices
-    NbCore=min(NbCore,NbProcess);% at least one process per core
+    NbProcess=Param.IndexRange.NbSlice;% the parameter NbSlice sets the nbre of run processes 
+    NbCore=min(NbCore,NbProcess);% reduces the number of cores if it exceeds the number of processes
 end
 
@@ -1662 +1664 @@
 OutputNomType=nomtype2pair(Param.InputTable{1,4});% nomenclature for output files
 
-%% get the set of reference field indices
-first_i=1;
-last_i=1;
-incr_i=1;
-first_j=1;
-last_j=1;
-incr_j=1;
+%% get the set of reference input field indices 
+first_i=1;% first i index to process
+last_i=1;% last i index to process
+incr_i=1;% increment step in i index
+first_j=1;% first j index to process
+last_j=1;% last j index to process
+incr_j=1;% increment step in j index
 if isfield(Param.IndexRange,'first_i')
     first_i=Param.IndexRange.first_i;
@@ -1688 +1690 @@
     set(handles.num_incr_i,'String','1')
 end
+% case of no increment i defined: processing is done on the available files found in i1_series
 if isempty(incr_i)
     if isempty(incr_j)
@@ -1701 +1704 @@
         ref_i=ref_i(ref_i>=first_i & ref_i<=last_i);
     end
+% increment i is defined: processing is done on first_i:incr_i:last_i;
 else
     ref_i=first_i:incr_i:last_i;
@@ -1711 +1715 @@
     end
 end
-BlockLength=ceil(numel(ref_i)/NbProcess);
-nbfield_j=numel(ref_j);
+BlockLength=ceil(numel(ref_i)/NbProcess);% nbre of input fields in each process 
+nbfield_j=numel(ref_j); % number of j indices
 
 %% record nbre of output files and starting time for computation for status
@@ -1729 +1733 @@
 set(handles.status,'UserData',StatusData)
 
-
+%% case of a function in Python
 if strcmp(ActionExt, '.py (in dev.)')
     fprintf([
@@ -1759 +1763 @@
             %Param.IndexRange.last_i=min(first_i+(iprocess)*BlockLength*incr_i-1,last_i);
         else %multislices (then incr_i is not empty)
-             Param.IndexRange.first_i= first_i+incr_i*(iprocess-1);
-             Param.IndexRange.incr_i=incr_i*Param.IndexRange.NbSlice;
+            Param.IndexRange.first_i= first_i+incr_i*(iprocess-1);
+            Param.IndexRange.incr_i=incr_i*Param.IndexRange.NbSlice;
         end
         if isfield(Param,'OutputSubDir')
-        t=struct2xml(Param);
-        t=set(t,1,'name','Series');
-        filexml=fullfile_uvmat(DirXml,'',Param.InputTable{1,3},'.xml',OutputNomType,...
-            Param.IndexRange.first_i,Param.IndexRange.last_i,first_j,last_j);
-        save(t,filexml);
+            t=struct2xml(Param);
+            t=set(t,1,'name','Series');
+            filexml=fullfile_uvmat(DirXml,'',Param.InputTable{1,3},'.xml',OutputNomType,...
+                Param.IndexRange.first_i,Param.IndexRange.last_i,first_j,last_j);
+            save(t,filexml);
         end
         switch ActionExt
@@ -1895 +1899 @@
         for iprocess=1:NbProcess
             system([batch_file_list{iprocess} ' &'])% directly execute the command file for each process
-            msgbox_uvmat('CONFIRMATION',[ActionName ' launched in background: press STATUS to see results'])
-        end
+        end
+        msgbox_uvmat('CONFIRMATION',[ActionName ' launched in background: press STATUS to see results'])
     case 'cluster_oar' % option 'oar-parexec' used
         %create subdirectory for oar command and log files
@@ -2041 +2045 @@
 drawnow
 
-%% check whether the input file(s) need to be refreshed
-% SeriesData=get(handles.series,'UserData');%hidden parameters
-% if ~isfield(SeriesData,'i1_series')
-%     msgbox_uvmat('ERROR','The input field series needs to be refreshed: press REFRESH');
-%     return
-% end
-
 %% get Action name and path
 NbBuiltinAction=get(handles.Action,'UserData'); %nbre of functions initially proposed in the menu ActionName (as defined in the Opening fct of series)
@@ -2106 +2103 @@
        set(handles.ActionName,'UserData',ActionPathList);
     set(handles.ActionExt,'Value',ActionExtIndex)
-%     ActionPathList{ActionIndex,ActionExtIndex}=PathName;
         
     %record the user defined menu additions in personal file profil_perso
@@ -2134 +2130 @@
 
 %% create the function handle for Action
-path_series=which('series');
-if ~isequal(ActionPath,path_series)
-    eval(['spath=which(''' ActionName ''');']) %spath = current path of the selected function ACTION
-    if ~exist(ActionPath,'dir')
-        errormsg=['The prescribed function path ' ActionPath ' does not exist'];
-        return
-    end
-    if ~isequal(spath,ActionPath)
-        addpath(ActionPath)% add the prescribed path if not the current one
-    end
-end
-eval(['h_fun=@' ActionName ';'])%create a function handle for ACTION
-if ~isequal(ActionPath,path_series)
-        rmpath(ActionPath)% add the prescribed path if not the current one    
-end
+if ~exist(ActionPath,'dir')
+    msgbox_uvmat('ERROR',['The prescribed function path ' ActionPath ' does not exist']);
+    return
+end
+current_dir=pwd;%current working dir
+cd(ActionPath)
+h_fun=str2func(ActionName);
+cd(current_dir)
+
+% 
+% checkaddpath=0;
+% path_series=which('series');
+% %eval(['spath=which(''' ActionName ''');']) %spath = current path of the selected function ACTION
+% spath=fileparts(which(ActionName)); %spath = current path of the selected function ACTION
+% if ~exist(ActionPath,'dir')
+%     msgbox_uvmat('ERROR',['The prescribed function path ' ActionPath ' does not exist']);
+%     return
+% end
+% if ~strcmp(spath,ActionPath)
+%     if strcmp(pwd,spath)
+%         msgbox_uvmat('ERROR',[ 'a function called ' ActionName ' on your working space oversets the selected one']);
+%         return
+%     else
+%         addpath(ActionPath)% add the prescribed path if not the current one
+%         checkaddpath=1;
+%     end
+% end
+% eval(['h_fun=@' ActionName ';'])%create a function handle for ACTION
+% if checkaddpath && ~isequal(ActionPath,path_series)
+%     rmpath(ActionPath)% add the prescribed path if not the current one
+% end
 
 %% Activate the Action fct to adapt the configuration of the GUI series and bring specific parameters in SeriesData
@@ -2185 +2197 @@
 FieldList_1=get(handles.FieldName_1,'String');% previous list as default
 if ~iscell(FieldList_1),FieldList_1={FieldList_1};end
-CheckList=0;% indicate whether FieldName has been updated
+%CheckList=0;% indicate whether FieldName has been updated
 CheckList_1=1;% indicate whether FieldName_1 has been updated
 handles_coord=[handles.Coord_x handles.Coord_y handles.Coord_z handles.Coord_x_title handles.Coord_y_title handles.Coord_z_title];
@@ -2195 +2207 @@
     set(handles.VelType_title,'Visible','on')
     FieldList=[set_field_list('U','V');{'C'};{'get_field...'}];%standard menu for civx data
-    CheckList=1;
+    %CheckList=1;
     set(handles.FieldName,'Value',1); %velocity vector choice by default
     if  VelTypeRequest_1 && numel(iview_civ)>=2 
@@ -2347 +2359 @@
 
 %% NbSlice visibility
-NbSliceVisible='off';%default
-if isfield(ParamOut,'NbSlice') && isequal(ParamOut.NbSlice,'on')
-    NbSliceVisible='on';
-    set(handles.num_NbProcess,'String',get(handles.num_NbSlice,'String'))% the nbre of processes is imposed as the nbre of slices
+%NbSliceVisible='off';%default
+if isfield(ParamOut,'NbSlice') && (strcmp(ParamOut.NbSlice,'on')||isnumeric(ParamOut.NbSlice))
+    set(handles.num_NbSlice,'Visible','on')
+    set(handles.NbSlice_title,'Visible','on')
 else
-    set(handles.num_NbProcess,'String','')% free nbre of processes 
-end
-set(handles.num_NbSlice,'Visible',NbSliceVisible)
-set(handles.NbSlice_title,'Visible',NbSliceVisible)
+    set(handles.num_NbSlice,'Visible','off')
+    set(handles.NbSlice_title,'Visible','off')
+    %     set(handles.num_NbProcess,'String',get(handles.num_NbSlice,'String'))% the nbre of processes is imposed as the nbre of slices
+    % else
+    %     set(handles.num_NbProcess,'String','')% free nbre of processes
+end
+if isnumeric(ParamOut.NbSlice)
+    set(handles.num_NbSlice,'String',num2str(ParamOut.NbSlice))
+    set(handles.num_NbSlice,'Enable','off'); % NbSlice set by the activation of the Action function
+else
+    set(handles.num_NbSlice,'Enable','on'); % NbSlice can be modified on the GUI series
+end
+% set(handles.num_NbSlice,'Visible',NbSliceVisible)
+% set(handles.NbSlice_title,'Visible',NbSliceVisible)
 
 
@@ -3003 +3025 @@
 %% create the function handle of the selected fct
 if ~isempty(TransformName)
+    if ~exist(TransformPathList{TransformIndex},'dir')
+        msgbox_uvmat('ERROR',['The prescribed transform function path ' TransformPathList{TransformIndex} ' does not exist']);
+        return
+    end
     current_dir=pwd;%current working dir
     cd(TransformPathList{TransformIndex})
@@ -3294 +3320 @@
 end
 
-function num_NbProcess_Callback(hObject, eventdata, handles)
+%function num_NbProcess_Callback(hObject, eventdata, handles)
 
 
 function num_NbSlice_Callback(hObject, eventdata, handles)
 NbSlice=str2num(get(handles.num_NbSlice,'String'));
-set(handles.num_NbProcess,'String',num2str(NbSlice))
+%set(handles.num_NbProcess,'String',num2str(NbSlice))
 
 %------------------------------------------------------------------------