Changeset 672 for trunk/src/mask_proj.m

Timestamp:

Aug 6, 2013, 3:47:07 PM (12 years ago)

Author:

sommeria

Message:

various bugs corrected

File:

• trunk/src/mask_proj.m (modified) (3 diffs)

trunk/src/mask_proj.m

@@ -35 +35 @@
 for icell=1:numel(CellInfo)
     if NbDimArray(icell)==2
+        XName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(1)};
+        YName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(2)};
+        if isfield(CellInfo{icell},'VarIndex_errorflag')
+            FFName=FieldData.ListVarName{CellInfo{icell}.VarIndex_errorflag};
+        else
+            FFName='FF';%default error (mask) flag name (if not already used)
+            if isfield(FieldData,'FF')
+                ind=1;
+                while isfield(FieldData,['FF_' num2str(ind)])
+                    ind=ind+1;
+                end
+                FFName=['FF_' num2str(ind)];% append an index to the name of error flag, FF_1,FF_2...
+            end
+            ProjData.ListVarName=[FieldData.ListVarName {FFName}];
+            ProjData.VarDimName=[FieldData.VarDimName FieldData.VarDimName(CellInfo{icell}.CoordIndex(1))];
+            ProjData.VarAttribute{numel(FieldData.VarDimName)}.Role='errorflag';
+        end
         switch CellInfo{icell}.CoordType;
-            case  'scattered'
-                XName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(1)};
-                YName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(2)};
+            case  'scattered'               
                 mask_ind_i=round(0.5+(FieldData.(XName)-MaskData.AX(1))/DX);%nbpoint terms
                 mask_ind_j=round(0.5+(FieldData.(YName)-MaskData.AY(1))/DY);%nbpoint terms
@@ -46 +61 @@
                 MaskData.A=reshape(MaskData.A,1,[]);
                 checkfalse(MaskData.A(checkin)>200)=0;
-                if ~isfield(FieldData,'FF')
-                    FieldData.FF=zeros(size(FieldData.(XName)));
-                    FieldData.ListVarName=[FieldData.ListVarName {'FF'}];
-                    FieldData.VarDimName=[FieldData.VarDimName FieldData.VarDimName(CellInfo{icell}.CoordIndex(1))];
-                    FieldData.VarAttribute{numel(FieldData.VarDimName)}.Role='errorflag';
-                end
                 for ivar=1:numel(CellInfo{icell}.VarIndex)
                     VarName=FieldData.ListVarName{CellInfo{icell}.VarIndex(ivar)};
-                    FieldData.(VarName)(checkfalse)=0;
-                    FieldData.FF(checkfalse)=1;
+                    ProjData.(VarName)(checkfalse)=0;
                 end
+                if ~isfield(CellInfo{icell},'VarIndex_errorflag')% an error flag already exists in the current cell
+                    ProjData.(FFName)=zeros(size(ProjData.(VarName)));
+                end
+                ProjData.(FFName)(checkfalse)=1;
             case  'grid'
-                XName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(1)};
-                YName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(2)};
                 Var1Name=FieldData.ListVarName{CellInfo{icell}.VarIndex(1)};
                 [Npy_field,Npx_field]=size(FieldData.(Var1Name));
@@ -70 +80 @@
                 [XMask,YMask]=meshgrid(XMask,YMask);
                 Mask = interp2(XMask,YMask,MaskData.A,XArray,YArray','nearest');
-%                 figure(1)
-%                 image(MaskData.A)
-                Mask=Mask>200;
-                if ~isfield(FieldData,'FF')
-                    FieldData.FF=zeros(size(FieldData.(XName)));
-                    FieldData.ListVarName=[FieldData.ListVarName {'FF'}];
-                    FieldData.VarDimName=[FieldData.VarDimName FieldData.VarDimName(CellInfo{icell}.CoordIndex(1))];
-                    FieldData.VarAttribute{numel(FieldData.VarDimName)}.Role='errorflag';
-                end
+                Mask=Mask>200;                
                 for ivar=1:numel(CellInfo{icell}.VarIndex)
                     VarName=FieldData.ListVarName{CellInfo{icell}.VarIndex(ivar)};
-                    FieldData.(VarName)=FieldData.(VarName).*Mask;
-                    FieldData.FF=~Mask;
+                    if ~strcmp(VarName,FFName)
+                        ProjData.(VarName)=FieldData.(VarName).*Mask;
+                    end
+                end
+                if isfield(CellInfo{icell},'VarIndex_errorflag')% an error flag already exists in the current cell
+                    ProjData.(FFName)=FieldData.(FFName) | ~Mask;
+                else
+                    ProjData.(FFName)= ~Mask;
                 end
         end
     end
 end
-        
 
+