Changeset 912 for trunk/src/proj_field.m

Timestamp:

Jun 16, 2015, 8:15:10 PM (8 years ago)

Author:

sommeria

Message:

interp range introduced in set_object

File:

• trunk/src/proj_field.m (modified) (3 diffs)

trunk/src/proj_field.m

@@ -1010 +1010 @@
 end
 
+%% interpolation range
+thresh2=[];
+if isfield(ObjectData,'RangeInterp')
+    thresh2=ObjectData.RangeInterp*ObjectData.RangeInterp;%square of interpolation range (do not interpolate beyond this range)
+end
+
 %% initiate Matlab  structure for physical field
 [ProjData,errormsg]=proj_heading(FieldData,ObjectData);
@@ -1303 +1309 @@
                     Disty=G(XI,YI)-YI;% diff of y coordinates with the nearest measurement point
                     Dist=Distx.*Distx+Disty.*Disty;
-                    for ivar=1:numel(VarVal)
-                        VarVal{ivar}(Dist>16*ProjData.CoordMesh)=NaN;% % put to NaN interpolated positions further than 4 meshes from initial data
-                    end  
-                    
+                    if ~isempty(thresh2)
+                        for ivar=1:numel(VarVal)
+                            VarVal{ivar}(Dist>thresh2)=NaN;% % put to NaN interpolated positions further than 4 meshes from initial data
+                        end
+                    end
                     if isfield(CellInfo{icell},'CheckSub') && CellInfo{icell}.CheckSub && ~isempty(vector_x_proj)
                         ProjData.(FieldData.ListVarName{vector_x_proj})=ProjData.(FieldData.ListVarName{vector_x_proj})-VarVal{1};
@@ -1358 +1365 @@
                 for ilist=1:numel(ListVarName)% reshape data, excluding coordinates (ilist=1-2), TODO: rationalise
                     VarName=ListVarName{ilist};
+                    VarDimName{ilist}={'coord_y','coord_x'};
                     ProjData.(VarName)=DataOut.(VarName);
-                    ProjData.(VarName)(Dist>16*ProjData.CoordMesh)=NaN;% put to NaN interpolated positions further than 4 meshes from initial data
-                    VarDimName{ilist}={'coord_y','coord_x'};
+                    if ~isempty(thresh2)
+                        ProjData.(VarName)(Dist>thresh2)=NaN;% put to NaN interpolated positions further than RangeInterp from initial data
+                    end
                 end
             end