Changeset 1118

Timestamp:

Jun 2, 2022, 12:22:11 PM (3 years ago)

Author:

sommeria

Message:

civdata from get_field repaired, detail data output activated in stereo_civ

Location:

trunk/src

Files:

• series/stereo_civ.m (modified) (9 diffs)
• uvmat.m (modified) (4 diffs)

trunk/src/series/stereo_civ.m

@@ -149 +149 @@
 j2_series_Civ2=j2_series_Civ1;
 
-% if isempty(j1_series_Civ1)
-%     FrameIndex_A_Civ1=i1_series_Civ1;
-%     FrameIndex_B_Civ1=i2_series_Civ1;
-%     j1_series_Civ1=ones(size(i1_series_Civ1));
-%     j2_series_Civ1=ones(size(i1_series_Civ1));
-% else
-%     FrameIndex_A_Civ1=j1_series_Civ1;
-%     FrameIndex_B_Civ1=j2_series_Civ1;
-% end
 if isempty(PairCiv2)
     FrameIndex_A_Civ2=FrameIndex_A_Civ1;
@@ -289 +280 @@
        
     Civ1Dir=OutputDir;
-
-%         ncfile=fullfile_uvmat(RootPath_A,Civ1Dir,[RootFile_A,'_All'],'.nc',NomTypeNc,i2_series_Civ1(ifield),[],...
-%             j1_series_Civ1(ifield),j2_series_Civ1(ifield));
-        
         
         ncfile2=fullfile_uvmat(RootPath_A,Civ1Dir,RootFile_A,'.nc',NomTypeNc,i2_series_Civ1(ifield),[],...
@@ -527 +514 @@
             mask=imread(par_civ2.Mask);
         end
-%         ibx2=ceil(par_civ2.CorrBoxSize(1)/2);
-%         iby2=ceil(par_civ2.CorrBoxSize(2)/2);
         par_civ2.SearchBoxShift=[Shiftx(nbval>=1)./nbval(nbval>=1) Shifty(nbval>=1)./nbval(nbval>=1)];
         par_civ2.Grid=[par_civ2.Grid(nbval>=1,1)-par_civ2.SearchBoxShift(:,1)/2 par_civ2.Grid(nbval>=1,2)-par_civ2.SearchBoxShift(:,2)/2];% grid taken at the extrapolated origin of the displacement vectors
@@ -685 +670 @@
             mask=imread(par_civ3.Mask);
         end
-%         ibx2=ceil(par_civ3.CorrBoxSize(1)/2);
-%         iby2=ceil(par_civ3.CorrBoxSize(2)/2);
         par_civ3.SearchBoxShift=[Shiftx(nbval>=1)./nbval(nbval>=1) Shifty(nbval>=1)./nbval(nbval>=1)];
         par_civ3.Grid=[par_civ3.Grid(nbval>=1,1)-par_civ3.SearchBoxShift(:,1)/2 par_civ3.Grid(nbval>=1,2)-par_civ3.SearchBoxShift(:,2)/2];% grid taken at the extrapolated origin of the displacement vectors
@@ -755 +738 @@
     end
 
-    
      %% Patch3
     if isfield (Param.ActionInput,'Patch3')
@@ -785 +767 @@
         Data.Civ3_FF(ind_good)=FFres;
         Data.CivStage=Data.CivStage+1;
-        
-            
-         % get z from u and v (displacements)
-       
+           
+         % get z from u and v (displacements)     
         Data.Xmid=Rangx(1)+(Rangx(2)-Rangx(1))*(Data.Civ3_X-0.5)/(Npx-1);%temporary coordinate (velocity taken at the point middle from imgae 1 and 2)
         Data.Ymid=Rangy(2)+(Rangy(1)-Rangy(2))*(Data.Civ3_Y-0.5)/(Npy-1);%temporary coordinate (velocity taken at the point middle from imgae 1 and 2)
@@ -803 +783 @@
     
     %% write result in a netcdf file if requested
-%     if LSM ~= 1 % store all data
-%         if exist('ncfile','var')
-%             errormsg=struct2nc(ncfile,Data);
-%             if isempty(errormsg)
-%                 disp([ncfile ' written'])
-%             else
-%                 disp(errormsg)
-%             end
-%         end
-%     else
+    if LSM ~= 1 % store all data
+        if exist('ncfile','var')
+            errormsg=struct2nc(ncfile,Data);
+            if isempty(errormsg)
+                disp([ncfile ' written'])
+            else
+                disp(errormsg)
+            end
+        end
+    else
        % store only phys data
-       % Data_light.ListVarName={'Xphys','Yphys','Zphys','Civ3_C','Xmid','Ymid','Uphys','Vphys','Error'};
-       % Data_light.VarDimName={'nb_vec_3','nb_vec_3','nb_vec_3','nb_vec_3','nb_vec_3','nb_vec_3','nb_vec_3','nb_vec_3','nb_vec_3'};
         Data_light.ListVarName={'Xphys','Yphys','Zphys','Civ3_C','DX','DY','Error'};
         Data_light.VarDimName={'nb_vec_3','nb_vec_3','nb_vec_3','nb_vec_3','nb_vec_3','nb_vec_3','nb_vec_3'};
@@ -828 +806 @@
         Data_light.Xphys=Data.Xphys(ind_good);
         Data_light.Civ3_C=Data.Civ3_C(ind_good);
-%         Data_light.Xmid=Data.Xmid(ind_good);
-%         Data_light.Ymid=Data.Ymid(ind_good);
         Data_light.DX=Data.Uphys(ind_good);
         Data_light.DY=Data.Vphys(ind_good);
@@ -842 +818 @@
        end
        
-%     end
+    end
 end
 disp(['ellapsed time for the loop ' num2str(toc) ' s'])

trunk/src/uvmat.m

@@ -4702 +4702 @@
                 %set(huvmat,
             case 'civdata...'%reinitiate input, return to automatic civ data readingget_field
+                UvData.FileInfo{1}.FieldType='netcdf';
+            set(handles.uvmat,'UserData',UvData)
                 display_file_name(handles,FileName,1)
         end
@@ -4724 +4726 @@
                     set(handles.MaxIndex_i,'String',MaxIndex_i)%TODO: record time unit
                     UvData.TimeUnit=GetFieldData.Time.TimeUnit;
-                    set(handles.uvmat,'UserData',UvData);
+% %                     set(handles.uvmat,'UserData',UvData);
                     set(handles.FileIndex,'String','')
                     ParamIn.TimeVarName=GetFieldData.Time.TimeName;
@@ -4736 +4738 @@
                     set(handles.MaxIndex_i,'String',MaxIndex_i)%TODO: record time unit
                     UvData.TimeUnit=GetFieldData.Time.TimeUnit;
-                    set(handles.uvmat,'UserData',UvData);
+%                     set(handles.uvmat,'UserData',UvData);
                     set(handles.FileIndex,'String','')
                     ParamIn.TimeDimName=GetFieldData.Time.TimeName;
@@ -4747 +4749 @@
             set(handles.ColorScalar,'Value',1)
             set(handles.ColorScalar,'String',VecColorList);
-           % UvData.FileInfo{1}.FileType='netcdf';
+            UvData.FileInfo{1}.FieldType='netcdf';
             set(handles.uvmat,'UserData',UvData)
             REFRESH_Callback(hObject, eventdata, handles)