Changeset 1165 for trunk/src/series/civ_3D.m

Timestamp:

Jul 30, 2024, 6:44:35 PM (2 months ago)

Author:

sommeria

Message:

various bugs repaired

File:

• trunk/src/series/civ_3D.m (modified) (6 diffs)

trunk/src/series/civ_3D.m

@@ -299 +299 @@
         par_civ1.ImageA=zeros(2*SearchRange_z+1,npy,npx);%image block initiation
         par_civ1.ImageB=zeros(2*SearchRange_z+1,npy,npx);
-        Data.Coord_z=SearchRange_z+1:par_civ1.Dz:NbSlice-1;
-        z_index=1;%first vertical block centered at image index z_index=SearchRange_z+1
-        for iz=1:2*SearchRange_z+1
+        Data.Coord_z=(1:floor((NbSlice-SearchRange_z)/par_civ1.Dz))+SearchRange_z;%SearchRange_z+1:par_civ1.Dz:NbSlice-1;
+        z_index=1;%first vertical block centered at image index par_civ1.Dz (not SearchRange_z+1
+        for iz=1:par_civ1.Dz+SearchRange_z%2*SearchRange_z+1
             j_image_index=j1_series_Civ1(iz,1)% j index of the current image
             ImageName_A=fullfile_uvmat(RootPath_A,SubDir_A,RootFile_A,FileExt_A,NomType_A,i1_series_Civ1(1,ifield),[],j_image_index);%
@@ -307 +307 @@
             ImageName_B=fullfile_uvmat(RootPath_B,SubDir_B,RootFile_B,FileExt_B,NomType_B,i2_series_Civ1(1,ifield),[],j_image_index);
             B= read_image(ImageName_B,FileType_B);
-            par_civ1.ImageA(iz,:,:) = A;
-            par_civ1.ImageB(iz,:,:) = B;
+            par_civ1.ImageA(iz+SearchRange_z-par_civ1.Dz+1,:,:) = A;
+            par_civ1.ImageB(iz+SearchRange_z-par_civ1.Dz+1,:,:) = B;
         end
         
@@ -354 +354 @@
             par_civ1.ImageB=circshift(par_civ1.ImageB,-par_civ1.Dz,1);
             for iz=1:par_civ1.Dz %read the new images at the end of the image block
-                image_index=z_index*par_civ1.Dz+SearchRange_z-par_civ1.Dz+iz+1;
-                if image_index<=size(j1_series_Civ1,1)
-                    j_image_index=j1_series_Civ1(z_index*par_civ1.Dz+SearchRange_z-par_civ1.Dz+iz+1,1)
+                j_image_index=z_index*par_civ1.Dz+SearchRange_z-par_civ1.Dz+iz
+                if j_image_index<=size(j1_series_Civ1,1)
+%                     j_image_index=j1_series_Civ1(image_index,1)
                     ImageName_A=fullfile_uvmat(RootPath_A,SubDir_A,RootFile_A,FileExt_A,NomType_A,i1_series_Civ1(1,ifield),[],j_image_index);%
                     A= read_image(ImageName_A,FileType_A);
@@ -444 +444 @@
         Data.VarAttribute{nbvar+2}.Role='vector_y';
         Data.VarAttribute{nbvar+5}.Role='vector_z';
+        
+        [Data.ListVarName,IA]=unique(Data.ListVarName);%suppress duplicate definition of variables (in cas of patch redone from previous file)
+        Data.VarDimName=Data.VarDimName(IA);
+        Data.VarAttribute=Data.VarAttribute(IA);
         Data.Civ1_U_smooth=Data.Civ1_U;
         Data.Civ1_V_smooth=Data.Civ1_V;
@@ -466 +470 @@
         [Data.Civ1_SubRange,Data.Civ1_NbCentres,Data.Civ1_Coord_tps,Data.Civ1_U_tps,Data.Civ1_V_tps,Data.Civ1_W_tps,...
             Data.Civ1_U_smooth(ind_good),Data.Civ1_V_smooth(ind_good),Data.Civ1_W_smooth(ind_good),FFres]=...
-            filter_tps_3D(Data.Civ1_X(ind_good),Data.Civ1_Y(ind_good),Civ1_Z(ind_good),Data.Civ1_U(ind_good),Data.Civ1_V(ind_good),Data.Civ1_W(ind_good),...
+            filter_tps_3D([Data.Civ1_X(ind_good) Data.Civ1_Y(ind_good) Civ1_Z(ind_good)],Data.Civ1_U(ind_good),Data.Civ1_V(ind_good),Data.Civ1_W(ind_good),...
             Data.Patch1_SubDomainSize,Data.Patch1_FieldSmooth,Data.Patch1_MaxDiff);
         Data.Civ1_FF(ind_good)=uint8(4*FFres);
@@ -699 +703 @@
         Data.VarDimName=[Data.VarDimName {'nb_vec_2','nb_vec_2',{'nb_coord','nb_bounds','nb_subdomain_2'},{'nb_subdomain_2'},...
             {'nb_tps_2','nb_coord','nb_subdomain_2'},{'nb_tps_2','nb_subdomain_2'},{'nb_tps_2','nb_subdomain_2'}}];
+     
+        
         
         Data.VarAttribute{nbvar+1}.Role='vector_x';