Changeset 1142 for trunk

Timestamp:

May 5, 2024, 12:29:30 PM (8 months ago)

Author:

sommeria

Message:

filter parameter improved in filter_tps

Location:

trunk/src

Files:

• filter_tps.m (modified) (6 diffs)
• series/test_patch_tps.m (modified) (4 diffs)

trunk/src/filter_tps.m

@@ -6 +6 @@
 % SubRange(NbCoord,2,NbSubdomain): range (min, max) of the coordinates x and y respectively, for each subdomain
 % NbCentre(NbSubdomain): number of source points for each subdomain
-% FF: false flags
+% FF: false flags preserved from the input, or equal to 20 for vectors excluded by the difference with the smoothed field
 % U_smooth, V_smooth: filtered velocity components at the positions of the initial data
 % Coord_tps(NbCentre,NbCoord,NbSubdomain): positions of the tps centres
-% U_tps,V_tps: weight of the tps for each subdomain
+% U_tps,V_tps: weight of the tps centers for each subdomain
 % to get the interpolated field values, use the function calc_field.m
 %
@@ -62 +62 @@
 %% smoothing parameter: CHANGED 03 May 2024 TO GET RESULTS INDEPENDENT OF SUBDOMAINSIZE
 %smoothing=Siz(1)*Siz(2)*FieldSmooth/1000%optimum smoothing increase as the area of the subdomain (division by 1000 to reach good values with the default GUI input)
-smoothing=sqrt(Siz(1)*Siz(2)/SubDomainSize)*FieldSmooth;%optimum smoothing increase as the typical mesh size =sqrt(SizX*SizY/SubDomainSize)^1/2
+NbVecSub=NbVec/NbSubDomain;% refined estimation of the nbre of vectors per subdomain
+smoothing=sqrt(Siz(1)*Siz(2)/NbVecSub)*FieldSmooth;%optimum smoothing increase as the typical mesh size =sqrt(SizX*SizY/NbVecSub)^1/2
 %% default output
 SubRange=zeros(NbCoord,2,NbSubDomain);%initialise the boundaries of subdomains
@@ -80 +81 @@
 %% calculate tps coeff in each subdomain
 for isub=1:NbSubDomain
-    isub
     SubRange(1,:,isub)=[CentreX(isub)-0.55*Siz(1) CentreX(isub)+0.55*Siz(1)];%bounds of subdomain #isub in x coordinate
     SubRange(2,:,isub)=[CentreY(isub)-0.55*Siz(2) CentreY(isub)+0.55*Siz(2)];%bounds of subdomain #isub in y coordinate
@@ -89 +89 @@
         ind_sel_previous=ind_sel;% record the set of selected vector indices for next iteration
         ind_sel=find(Coord(:,1)>=SubRange(1,1,isub) & Coord(:,1)<=SubRange(1,2,isub) & Coord(:,2)>=SubRange(2,1,isub) & Coord(:,2)<=SubRange(2,2,isub));
-        numel(ind_sel)
+        %disp([numel(ind_sel) ' vectors in subdomain #' num2str(isub)])
         % if no vector in the subdomain  #isub, skip the subdomain
         if isempty(ind_sel)
@@ -124 +124 @@
                 V_tps(1:NbCentre(isub)+3,isub)=V_tps_sub;
                 nb_select(ind_sel)=nb_select(ind_sel)+weight;
-                display(['tps done in subdomain # ' num2str(isub)  ' among ' num2str(NbSubDomain)])
+                display(['tps done with ' num2str(numel(ind_sel)) ' vectors in subdomain # ' num2str(isub)  ' among ' num2str(NbSubDomain)])
                 break
             % if too few selected vectors, increase the subrange for next iteration
@@ -146 +146 @@
                 V_tps(1:NbCentre(isub)+3,isub)=V_tps_sub;
                 nb_select(ind_sel(ind_ind_sel))=nb_select(ind_sel(ind_ind_sel))+weight;
-                display(['tps redone after elimination of erratic vectors in subdomain # ' num2str(isub) ' among ' num2str(NbSubDomain)])
+                display(['tps redone with ' num2str(numel(ind_sel)) ' vectors after elimination of ' num2str(numel(ind_ind_sel)) ' erratic vectors in subdomain # ' num2str(isub) ' among ' num2str(NbSubDomain)])
                 break
             end

trunk/src/series/test_patch_tps.m

@@ -33 +33 @@
 %              .FieldName: name(s) of the field
 %              .VelType: velocity type
-%              .FieldName_1: name of the second field in case of two input series
-%              .VelType_1: velocity type of the second field in case of two input series
-%              .Coord_y: name of y coordinate variable
-%              .Coord_x: name of x coordinate variable
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -110 +106 @@
             case {4,5}
                 CivStage='civ2';
-                MaxDiff=1.5; SubDomainSize=500; FieldSmooth=2; %default
+                MaxDiff=1.5; SubDomainSize=250; FieldSmooth=5; %default
             case 6
                 CivStage='civ2';
@@ -211 +207 @@
 
 %% Prepare the structure of output netcdf file
-DataOut.ListGlobalAttribute={'CivStage'};
+DataOut.ListGlobalAttribute={'CivStage','SubDomainSize','MaxDiff','CoordUnit'};
 DataOut.CivStage=Param.InputFields.VelType;
-DataOut.ListVarName=[{'FieldSmooth','Diff_rms','NbExclude','FF','X','Y'} Ustr Vstr] ;
-DataOut.VarDimName=[{'FieldSmooth','FieldSmooth','FieldSmooth','NbVec','NbVec','NbVec'} Dimstr Dimstr]; 
+DataOut.SubDomainSize=SubDomainSize;
+DataOut.MaxDiff=MaxDiff;
+DataOut.CoordUnit='pixel';
+DataOut.ListVarName=[{'FieldSmooth','Diff_rms','NbExclude','X','Y'} Ustr Vstr] ;
+DataOut.VarDimName=[{'FieldSmooth','FieldSmooth','FieldSmooth','NbVec','NbVec'} Dimstr Dimstr]; 
 DataOut.VarAttribute{4}.Role='falseflag';
 DataOut.FieldSmooth=FieldSmooth;
@@ -249 +248 @@
         DataOut.Diff_rms(irho)=sqrt(mean(U_Diff.*U_Diff+V_Diff.*V_Diff)/2);
         DataOut.NbExclude(irho)=(NbGood-numel(ind_good))/NbGood;
+        U_smooth(ind_false)=NaN;
+        V_smooth(ind_false)=NaN;
         DataOut.(['U_' str_i{irho}])=U_smooth;
         DataOut.(['V_' str_i{irho}])=V_smooth;
-        DataOut.FF(ind_false)=FieldSmooth(irho);
+        % DataOut.FF(ind_false)=FieldSmooth(irho);
     end
     time=toc