Changeset 589 for trunk/src/proj_field.m

Timestamp:

Mar 16, 2013, 3:46:12 PM (11 years ago)

Author:

sommeria

Message:

various minor corrections made

File:

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

trunk/src/proj_field.m

@@ -621 +621 @@
                 flagsel=ones(size(coord_x));
             end
-            if isequal(ProjMode,'projection') || isequal(ProjMode,'interp_tps')
+            if isequal(ProjMode,'projection') %|| isequal(ProjMode,'interp_tps')
                 flagsel=flagsel & ((coord_y -yinf(ip))*(xinf(ip+1)-xinf(ip))>(coord_x-xinf(ip))*(yinf(ip+1)-yinf(ip))) ...
                 & ((coord_y -ysup(ip))*(xsup(ip+1)-xsup(ip))<(coord_x-xsup(ip))*(ysup(ip+1)-ysup(ip))) ...
@@ -633 +633 @@
             for iselect=1:numel(VarIndex)-2*testU
                 VarName=FieldData.ListVarName{VarIndex(iselect)};
-                eval(['ProjVar{iselect}=FieldData.' VarName '(indsel);']);%scalar value
+                ProjVar{iselect}=FieldData.(VarName)(indsel);%scalar value
             end   
             if testU
@@ -1185 +1185 @@
                         FieldData=rmfield(FieldData,FieldData.ListVarName{CellInfo{icell}.VarIndex_warnflag});
                     end
+                    % interpolate and calculate field on the grid
                     [VarVal,ListFieldProj,VarAttribute,errormsg]=calc_field_interp([coord_X coord_Y],FieldData,CellInfo{icell}.FieldName,XI,YI);
+                    
                     if isfield(CellInfo{icell},'CheckSub') && CellInfo{icell}.CheckSub && ~isempty(vector_x_proj)
                         ProjData.(ProjData.ListVarName{vector_x_proj})=ProjData.(ProjData.ListVarName{vector_x_proj})-VarVal{1};
@@ -1833 +1835 @@
                         eval(['FieldData.' VarName '=FieldData.' VarName '(indsel);'])
                     end
-                    eval(['InterpFct=TriScatteredInterp(double(coord_X),double(coord_Y),double(coord_Z),double(FieldData.' VarName '))'])
-                    eval(['ProjData.' VarName '=InterpFct(X,Y,Z);'])
+                    % linear interpolation
+                    InterpFct=TriScatteredInterp(double(coord_X),double(coord_Y),double(coord_Z),double(FieldData.(VarName)));
+                    ProjData.(VarName)=InterpFct(X,Y,Z);
 %                     eval(['varline=reshape(ProjData.' VarName ',1,length(coord_y_proj)*length(coord_x_proj));'])
 %                     FFlag= isnan(varline); %detect undefined values NaN