Changeset 868

Timestamp:

Feb 13, 2015, 11:22:01 AM (10 years ago)

Author:

sommeria

Message:

histo_diff upadated

Location:

trunk/src

Files:

• series.m (modified) (2 diffs)
• series/histo_diff.m (modified) (4 diffs)

trunk/src/series.m

@@ -2105 +2105 @@
 if FieldNameRequest && numel(iview_netcdf)>=1
     set(handles.InputFields,'Visible','on')
-    if CheckList==0        % not civ input made
+    %if CheckList==0        % not civ input made
         if isfield(SeriesData.FileInfo{iview_netcdf(1)},'ListVarName')
         ListVarName=SeriesData.FileInfo{iview_netcdf(1)}.ListVarName;
@@ -2164 +2164 @@
         end
         end
-    else
-        set(handles_coord,'Visible','off')% no coord display for civ data
-    end
+%     else
+%         set(handles_coord,'Visible','off')% no coord display for civ data
+%     end
     set(handles.FieldName,'String',FieldList)
 else

trunk/src/series/histo_diff.m

@@ -166 +166 @@
     rmpath(Param.FieldTransform.TransformPath)
 end
-if ~(isfield(Param,'ProjObject')&& ismember(Param.ProjObject.ProjMode,{'polygon','rectangle','ellipse'}))
+if ~(isfield(Param,'ProjObject')&& ismember(Param.ProjObject.Type,{'polygon','rectangle','ellipse'}))
     disp_uvmat('ERROR','projection in a closed domain: polygon, rectangle or ellipse is needed for histograms',checkrun)
 end
@@ -205 +205 @@
     InputFields{2}=[];%default (case of images)
     if isfield(Param,'InputFields')
-        InputFields{2}=Param.InputFields{1};%default
+        InputFields{2}=InputFields{1};%default
         if isfield(Param.InputFields,'FieldName_1')
             InputFields{2}.FieldName=Param.InputFields.FieldName_1;
@@ -249 +249 @@
         if ~isempty(transform_fct)
             switch nargin(transform_fct)
-                case 4
-                    if length(Data)==2
-                        Field=transform_fct(Data{1},XmlData{1},Data{2},XmlData{2});
-                    else
-                        Field=transform_fct(Data{1},XmlData{1});
-                    end
-                case 3
-                    if length(Data)==2
-                        Field=transform_fct(Data{1},XmlData{1},Data{2});
-                    else
-                        Field=transform_fct(Data{1},XmlData{1});
-                    end
                 case 2
                     Field=transform_fct(Data{1},XmlData{1});
@@ -268 +256 @@
         end
         
-        %% calculate tps coefficients if needed
+        %% projection of the second (ref) field on the first one
+        % calculate tps coefficients if needed (spatial derivatives)
 %         if isfield(Param,'ProjObject')&&isfield(Param.ProjObject,'ProjMode')&& strcmp(Param.ProjObject.ProjMode,'interp_tps')
 %             Field=tps_coeff_field(Field,check_proj_tps);
-%         end
-        
-        %field projection on an object
-            [Field,errormsg]=proj_field(Field,Param.ProjObject);
+%         end       
+          Field.ListVarName={'X','Y','U','V'};
+          Field.VarDimName={'nb_vector','nb_vector','nb_vector','nb_vector'};
+          F.U=scatteredInterpolant(Data{2}.X,Data{2}.Y,Data{2}.U,'linear');
+          Field.U=Field.U-F.U(Field.X,Field.Y);%substract the interpolated ref to U
+          F.V=scatteredInterpolant(Data{2}.X,Data{2}.Y,Data{2}.V,'linear');
+          Field.V=Field.V-F.V(Field.X,Field.Y);%substract the interpolated ref to V
+          
+        %field projection on a close object yielding histogram
+            [Histo,errormsg]=proj_field(Field,Param.ProjObject);% calculate histogram
             if ~isempty(errormsg)
                 disp_uvmat('ERROR',['error in histo_diff/proj_field:' errormsg],checkrun)