Changeset 521 for trunk/src/proj_field.m

Timestamp:

Aug 18, 2012, 11:17:48 PM (12 years ago)

Author:

sommeria

Message:

various bugs corrected

File:

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

trunk/src/proj_field.m

@@ -909 +909 @@
 
 %% mesh sizes DX and DY
-DX=FieldData.Mesh;
-DY=FieldData.Mesh; %default 
 if isfield(ObjectData,'DX') && ~isempty(ObjectData.DX)
      DX=abs(ObjectData.DX);%mesh of interpolation points 
+else
+    DX=FieldData.Mesh;
 end
 if isfield(ObjectData,'DY') && ~isempty(ObjectData.DY)
      DY=abs(ObjectData.DY);%mesh of interpolation points 
+else
+    DY=FieldData.Mesh;
 end
 if  ~strcmp(ObjectData.ProjMode,'projection') && (DX==0||DY==0)
@@ -928 +930 @@
 testYMin=0;
 testYMax=0;
-XMin=FieldData.XMin;%default
-XMax=FieldData.XMax;%default
-YMin=FieldData.YMin;%default
-YMax=FieldData.YMax;%default
+
 if isfield(ObjectData,'RangeX')
         XMin=min(ObjectData.RangeX);
@@ -937 +936 @@
         testXMin=XMax>XMin;
         testXMax=1;
+else
+    XMin=FieldData.XMin;%default
+XMax=FieldData.XMax;%default
 end
 if isfield(ObjectData,'RangeY')
@@ -943 +945 @@
         testYMin=YMax>YMin;
         testYMax=1;
+else
+    YMin=FieldData.YMin;%default
+YMax=FieldData.YMax;%default
 end
 width=0;%default width of the projection band
@@ -1159 +1164 @@
                         coord_Y=coord_Y(indsel);
                     end
-                    testFF=0;
-                    nbvar=numel(ProjData.ListVarName);
+%                     testFF=0;
+%                     nbvar=numel(ProjData.ListVarName);
                     if isfield(VarType,'vector_x')&&isfield(VarType,'vector_y')&&~isempty(VarType.vector_x)
                         VarName_x=FieldData.ListVarName{VarType.vector_x};
@@ -1168 +1173 @@
                             FieldData.(VarName_y)=FieldData.(VarName_y)(indsel);
                         end
-                        FieldVar=cat(2,FieldData.(VarName_x),FieldData.(VarName_y));
+                        %FieldVar=cat(2,FieldData.(VarName_x),FieldData.(VarName_y));
                         if ~isfield(VarType,'CheckSub') || ~VarType.CheckSub
                             vector_x_proj=numel(ProjData.ListVarName)+1;
@@ -1179 +1184 @@
                             FieldData.(VarName_scalar)=FieldData.(VarName_scalar)(indsel);
                         end
-                        FieldVar=FieldData.(VarName_scalar);
+                       % FieldVar=FieldData.(VarName_scalar);
+                    end
+                    if ~isempty(VarType.ancillary)% do not project ancillary data with interp
+                        FieldData=rmfield(FieldData,FieldData.ListVarName{VarType.ancillary});
+                    end
+                    if ~isempty(VarType.warnflag)% do not project ancillary data with interp
+                        FieldData=rmfield(FieldData,FieldData.ListVarName{VarType.warnflag});
                     end
                     [VarVal,ListFieldProj,VarAttribute,errormsg]=calc_field_interp([coord_X coord_Y],FieldData,VarType.Operation,XI,YI);