Changeset 1131 for trunk/src/series

Timestamp:

Apr 11, 2024, 7:30:52 PM (4 months ago)

Author:

sommeria

Message:

updated to read pivdata from fluidimage

File:

• trunk/src/series/civ_series.m (modified) (16 diffs)

trunk/src/series/civ_series.m

@@ -21 +21 @@
 %           if absent no file is produced, result in the output structure Data (test mode)
 %     Param.ActionInput: substructure with the parameters provided by the GUI civ_input
-%                      .Civ1: parameters for civ1
+%                      .Civ1: parameters for civ1cc
 %                      .Fix1: parameters for fix1
 %                      .Patch1:
@@ -286 +286 @@
 end
 for ifield=1:NbField
-    tic
+    tstart=tic;
+    time_civ1=0;
+  time_patch1=0;
+  time_civ2=0;
+  time_patch2=0;
     if ~isempty(RUNHandle)% update the waitbar in interactive mode with GUI series  (checkrun=1)
         update_waitbar(WaitbarHandle,ifield/NbField)
@@ -382 +386 @@
                         continue
                     end
+                    tsart_input=tic;
                     [par_civ1.ImageA,VideoObject_A] = read_image(ImageName_A,FileType_A,VideoObject_A,FrameIndex_A_Civ1(ifield));
+                    time_input=toc(tsart_input);
                 end
                 ImageName_B=fullfile_uvmat(RootPath_B,SubDir_B,RootFile_B,FileExt_B,NomType_B,i2_series_Civ1(ifield),[],j2_series_Civ1(ifield));
@@ -501 +507 @@
         else %usual PIV
             % caluclate velocity data (y and v in indices, reverse to y component)
+            tstart_civ1=tic;
             [xtable, ytable, utable, vtable, ctable, F, result_conv, errormsg] = civ (par_civ1);
             if ~isempty(errormsg)
@@ -512 +519 @@
             Data.Civ1_C=reshape(ctable,[],1);
             Data.Civ1_F=reshape(F,[],1);
+            time_civ1=toc(tstart_civ1);
         end
     else% we use existing Civ1 data
@@ -561 +569 @@
     if isfield (Param.ActionInput,'Patch1')
         disp('patch1 started')
+         tstart_patch1=tic;
         if check_civx
             errormsg='Civ Matlab input needed for patch';
@@ -600 +609 @@
 
         % perform Patch calculation using the UVMAT fct 'filter_tps'
+       
         [Data.Civ1_SubRange,Data.Civ1_NbCentres,Data.Civ1_Coord_tps,Data.Civ1_U_tps,Data.Civ1_V_tps,tild,Ures, Vres,tild,FFres]=...
             filter_tps([Data.Civ1_X(ind_good) Data.Civ1_Y(ind_good)],Data.Civ1_U(ind_good),Data.Civ1_V(ind_good),[],Data.Patch1_SubDomainSize,Data.Patch1_FieldSmooth,Data.Patch1_MaxDiff);
@@ -605 +615 @@
         Data.Civ1_V_smooth(ind_good)=Vres;
         Data.Civ1_FF(ind_good)=int8(FFres);
+        time_patch1=toc(tstart_patch1);
         disp('patch1 performed')
     end
@@ -611 +622 @@
     if isfield (Param.ActionInput,'Civ2')
         disp('civ2 started')
+        tstart_civ2=tic;
         par_civ2=Param.ActionInput.Civ2;
         if CheckInputFile % read input images (except in mode Test where it is introduced directly in Param.ActionInput.Civ1.ImageNameA and B)
@@ -765 +777 @@
         
         % calculate velocity data (y and v in image indices, reverse to y component)
+        
         [xtable, ytable, utable, vtable, ctable, F,result_conv,errormsg] = civ (par_civ2);
         
@@ -806 +819 @@
         Data.Civ2_F=reshape(F,[],1);
         disp('civ2 performed')
+        time_civ2=toc(tstart_civ2);
     elseif ~isfield(Data,'ListVarName') % we start there, using existing Civ2 data
         if exist('ncfile','var')
@@ -836 +850 @@
         end
         Data.ListGlobalAttribute=[Data.ListGlobalAttribute Fix2_param];
-        %
-        %         ListFixParam=fieldnames(Param.ActionInput.Fix2);
-        %         for ilist=1:length(ListFixParam)
-        %             ParamName=ListFixParam{ilist};
-        %             ListName=['Fix2_' ParamName];
-        %             eval(['Data.ListGlobalAttribute=[Data.ListGlobalAttribute ''' ParamName '''];'])
-        %             eval(['Data.' ListName '=Param.ActionInput.Fix2.' ParamName ';'])
-        %         end
         if check_civx
             if ~isfield(Data,'fix2')
@@ -865 +871 @@
     if isfield (Param.ActionInput,'Patch2')
         disp('patch2 started')
+        tstart_patch2=tic;
         list_param=fieldnames(Param.ActionInput.Patch2)';
         list_param(strcmp('TestPatch2',list_param))=[];% remove the parameter TestCiv1 from the list
@@ -894 +901 @@
                         disp_uvmat('ERROR','all vectors of civ2 are bad, check input parameters' ,checkrun)
                         return
-        end
+                end
+              
         [Data.Civ2_SubRange,Data.Civ2_NbCentres,Data.Civ2_Coord_tps,Data.Civ2_U_tps,Data.Civ2_V_tps,tild,Ures,Vres,tild,FFres]=...
             filter_tps([Data.Civ2_X(ind_good) Data.Civ2_Y(ind_good)],Data.Civ2_U(ind_good),Data.Civ2_V(ind_good),[],Data.Patch2_SubDomainSize,Data.Patch2_FieldSmooth,Data.Patch2_MaxDiff);
@@ -901 +909 @@
         Data.Civ2_FF(ind_good)=FFres;
         Data.CivStage=Data.CivStage+1;
+        time_patch2=toc(tstart_patch2);
         disp('patch2 performed')
     end
@@ -913 +922 @@
             disp(errormsg)
         end
-        disp(['ellapsed time ' num2str(toc/60,2) ' minutes'])
+        time_total=toc(tstart);
+        disp(['ellapsed time ' num2str(time_total/60,2) ' minutes'])
+        disp(['time image reading ' num2str(time_input/60,2) ' minutes'])
+        disp(['time civ1 ' num2str(time_civ1/60,2) ' minutes'])
+        disp(['time patch1 ' num2str(time_patch1/60,2) ' minutes'])
+        disp(['time civ2 ' num2str(time_civ2/60,2) ' minutes'])
+        disp(['time patch2 ' num2str(time_patch2/60,2) ' minutes'])
+        disp(['time other ' num2str((time_total-time_input-time_civ1-time_patch1-time_civ2-time_patch2)/60,2) ' minutes'])
     end
 end