Changeset 667 for trunk/src/read_field.m

Timestamp:

Jul 15, 2013, 2:50:08 PM (11 years ago)

Author:

sommeria

Message:

a few bugs corrected.
multimask introduced in series
displ_uvmat transformed into disp_uvmat

File:

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

trunk/src/read_field.m

@@ -74 +74 @@
                 ListVar=[ListVar InputField(ilist)];
                 if check_colorvar(ilist)
-                                    Role{numel(ListVar)}='ancillary';% not projected with interpolation
-                ProjModeRequest{numel(ListVar)}='';
+                    Role{numel(ListVar)}='ancillary';% not projected with interpolation
+                    ProjModeRequest{numel(ListVar)}='';
                 else
-                Role{numel(ListVar)}='scalar';
-                ProjModeRequest{numel(ListVar)}='interp_lin';%scalar field (requires interpolation for plot)
+                    Role{numel(ListVar)}='scalar';
+                    ProjModeRequest{numel(ListVar)}='interp_lin';%scalar field (requires interpolation for plot)
                 end
             else  % an operator 'vec' or 'norm' is used
@@ -84 +84 @@
                 Role{numel(ListVar)}='vector_y';
                 Role{numel(ListVar)-1}='vector_x';
-                      if ~check_colorvar(ilist) && strcmp(r.Operator,'norm')
-                                    ProjModeRequest{numel(ListVar)-1}='interp_lin';%scalar field (requires interpolation for plot)
-                                    ProjModeRequest{numel(ListVar)}='interp_lin';
-                      else
-                                   ProjModeRequest{numel(ListVar)-1}='';
-                                   ProjModeRequest{numel(ListVar)}='';
-                            end
+                if ~check_colorvar(ilist) && strcmp(r.Operator,'norm')
+                    ProjModeRequest{numel(ListVar)-1}='interp_lin';%scalar field (requires interpolation for plot)
+                    ProjModeRequest{numel(ListVar)}='interp_lin';
+                else
+                    ProjModeRequest{numel(ListVar)-1}='';
+                    ProjModeRequest{numel(ListVar)}='';
+                end
             end
         end
@@ -96 +96 @@
             [Field,var_detect,ichoice]=nc2struct(FileName,'TimeDimName',ParamIn.TimeDimName,num,[ParamIn.Coord_x (ParamIn.Coord_y) ListVar]);
         else
-        [Field,var_detect,ichoice]=nc2struct(FileName,[ParamIn.Coord_x (ParamIn.Coord_y) ListVar]);
+            [Field,var_detect,ichoice]=nc2struct(FileName,[ParamIn.Coord_x (ParamIn.Coord_y) ListVar]);
         end
         if isfield(Field,'Txt')
@@ -108 +108 @@
             end
             Field.VarAttribute{ivar+2}.ProjModeRequest=ProjModeRequest{ivar};
-        end        
+        end
     case 'video'
         if strcmp(class(ParamIn),'VideoReader')