Changeset 651 for trunk/src/proj_field.m

Timestamp:

Jun 25, 2013, 12:48:10 AM (11 years ago)

Author:

sommeria

Message:

various bugs corrected. Introduction of campaign lists in Open menu

File:

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

trunk/src/proj_field.m

@@ -1053 +1053 @@
     switch CellInfo{icell}.CoordType
         
-        %% case of input fields with unstructured coordinates
         case 'scattered'
+        %% case of input fields with unstructured coordinates (applies for projMode ='projection' or 'interp_lin')
             if strcmp(ProjMode{icell},'interp_tps')
                 continue %skip for next cell (needs tps field cell)
@@ -1073 +1073 @@
             
             % selection of the vectors in the projection range (3D case)
-            if check3D&&  width > 0
+            if check3D &&  width > 0
                 %components of the unitiy vector normal to the projection plane
                 fieldZ=norm_plane(1)*coord_x + norm_plane(2)*coord_y+ norm_plane(3)*coord_z;% distance to the plane
@@ -1079 +1079 @@
                 for ivar=VarIndex
                     VarName=FieldData.ListVarName{ivar};
-                    eval(['FieldData.' VarName '=FieldData.' VarName '(indcut);'])
-                    % A VOIR : CAS DE VAR STRUCTUREE MAIS PAS GRILLE REGULIERE : INTERPOLER SUR GRILLE REGULIERE
+                    FieldData.(VarName)=FieldData.(VarName)(indcut);
                 end
                 coord_x=coord_x(indcut);
@@ -1138 +1137 @@
             end
             
-            % different cases of projection
+            % two cases of projection
             switch ProjMode{icell}
                 case 'projection'  
@@ -1174 +1173 @@
                         end
                     end
-%                     testFF=0;
-%                     nbvar=numel(ProjData.ListVarName);                            
-%                     if isfield(CellInfo{icell},'VarIndex_vector_x')&&isfield(CellInfo{icell},'VarIndex_vector_y')
-%                         VarName_x=FieldData.ListVarName{CellInfo{icell}.VarIndex_vector_x};
-%                         VarName_y=FieldData.ListVarName{CellInfo{icell}.VarIndex_vector_y};
-%                         if isfield(CellInfo{icell},'VarIndex_errorflag')
-%                             FieldData.(VarName_x)=FieldData.(VarName_x)(indsel);
-%                             FieldData.(VarName_y)=FieldData.(VarName_y)(indsel);
-%                         end
-%                         %FieldVar=cat(2,FieldData.(VarName_x),FieldData.(VarName_y));
-%                         if ~isfield(CellInfo{icell},'CheckSub') || ~CellInfo{icell}.CheckSub
-%                             vector_x_proj=numel(ProjData.ListVarName)+1;
-%                             vector_y_proj=numel(ProjData.ListVarName)+2;
-%                         end
-%                     end
-%                     if isfield(CellInfo{icell},'VarIndex_scalar')
-%                         VarName_scalar=FieldData.ListVarName{CellInfo{icell}.VarIndex_scalar};
-%                         if isfield(CellInfo{icell},'errorflag') && ~isempty(CellInfo{icell}.errorflag)
-%                             FieldData.(VarName_scalar)=FieldData.(VarName_scalar)(indsel);
-%                         end
-%                     end
-%                     if isfield(CellInfo{icell},'VarIndex_ancillary')% do not project ancillary data with interp
-%                         FieldData=rmfield(FieldData,FieldData.ListVarName{CellInfo{icell}.VarIndex_ancillary});
-%                     end
-%                     if isfield(CellInfo{icell},'VarIndex_warnflag')% do not project ancillary data with interp
-%                         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);
@@ -1223 +1195 @@
             end
 
-            %% case of tps interpolation (applies only in interp_tps mode and for spatial derivatives)
         case 'tps'
+        %% case of tps data (applies only in interp_tps mode)
             if strcmp(ProjMode{icell},'interp_tps')
                 Coord=FieldData.(FieldData.ListVarName{CellInfo{icell}.CoordIndex});