Changeset 382 for trunk/src/proj_field.m

Timestamp:

Feb 6, 2012, 11:46:39 PM (13 years ago)

Author:

sommeria

Message:

several bugs corrected
function filter_tps introduced (spline thin shell)

File:

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

trunk/src/proj_field.m

@@ -80 +80 @@
 %AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 
-function [ProjData,errormsg]=proj_field(FieldData,ObjectData)
+function [ProjData,errormsg]=proj_field(FieldData,ObjectData,FieldName)
 errormsg='';%default
 %% case of no projection (object is used only as graph display)
@@ -913 +913 @@
 %project on a plane 
 % AJOUTER flux,circul,error
- function  [ProjData,errormsg] = proj_plane(FieldData, ObjectData)
+ function  [ProjData,errormsg] = proj_plane(FieldData, ObjectData,FieldName)
 %-----------------------------------------------------------------
 
@@ -1164 +1164 @@
             coord_x_proj=XMin:DX:XMax;
             coord_y_proj=YMin:DY:YMax;
+            if isfield(FieldData,[VarName '_tps'])
+                [XI,YI]=meshgrid(coord_x_proj,coord_y_proj');
+                XI=reshape(XI,[],1);
+                YI=reshape(YI,[],1);         
+            end
             DimCell={'coord_y','coord_x'};
             ProjData.ListVarName={'coord_y','coord_x'};
@@ -1186 +1191 @@
             FF=zeros(1,length(coord_y_proj)*length(coord_x_proj));
             testFF=0;
+            if ~isempty(FieldName)
+                FieldData=calc_field(FieldName,FieldData,XI,YI);
+            end
             for ivar=VarIndex
                 VarName=FieldData.ListVarName{ivar};
@@ -1196 +1204 @@
                     end
                     if  ~isequal(ivar_FF,0)
-                        eval(['FieldData.' VarName '=FieldData.' VarName '(indsel);'])
-                    end
-                    eval(['ProjData.' VarName '=griddata_uvmat(double(coord_X),double(coord_Y),double(FieldData.' VarName '),coord_x_proj,coord_y_proj'',rho);'])
-                    eval(['varline=reshape(ProjData.' VarName ',1,length(coord_y_proj)*length(coord_x_proj));'])
+                        FieldData.(VarName)=FieldData.(VarName)(indsel);
+                    end
+%                     if isfield(FieldData,[VarName '_tps'])
+%                         [XI,YI]=meshgrid(coord_x_proj,coord_y_proj');
+%                         XI=reshape(XI,[],1);
+%                         YI=reshape(YI,[],1);
+%                         
+                   if ~isempty(FieldName)
+                        ProjData.(VarName)=griddata_uvmat(double(coord_X),double(coord_Y),double(FieldData.(VarName)),coord_x_proj,coord_y_proj',rho);
+                    end
+                    varline=reshape(ProjData.(VarName),1,length(coord_y_proj)*length(coord_x_proj));
                     FFlag= isnan(varline); %detect undefined values NaN
                     indnan=find(FFlag);
                     if~isempty(indnan)
                         varline(indnan)=zeros(size(indnan));
-                        eval(['ProjData.' VarName '=reshape(varline,length(coord_y_proj),length(coord_x_proj));'])
+                        ProjData.(VarName)=reshape(varline,length(coord_y_proj),length(coord_x_proj));
                         FF(indnan)=ones(size(indnan));
                         testFF=1;