Changeset 675 for trunk/src/read_field.m

Timestamp:

Aug 27, 2013, 11:25:21 PM (12 years ago)

Author:

sommeria

Message:

various bugs corrected

File:

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

trunk/src/read_field.m

@@ -69 +69 @@
     case 'netcdf'
         ListVar={};
+        Role={};
+        ProjModeRequest={};
         for ilist=1:numel(InputField)
             r=regexp(InputField{ilist},'(?<Operator>(^vec|^norm))\((?<UName>.+),(?<VName>.+)\)$','names');
@@ -81 +83 @@
                 end
             else  % an operator 'vec' or 'norm' is used
-                ListVar=[ListVar {r.UName,r.VName}];
-                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';
+                    ProjModeRequestVar='interp_lin';%scalar field (requires interpolation for plot)
                 else
-                    ProjModeRequest{numel(ListVar)-1}='';
-                    ProjModeRequest{numel(ListVar)}='';
+                    ProjModeRequestVar='';
+                end
+                ind_var_U=find(strcmp(r.UName,ListVar));%check previous listing of variable r.UName
+                ind_var_V=find(strcmp(r.VName,ListVar));%check previous listing of variable r.VName
+                if isempty(ind_var_U)
+                    ListVar=[ListVar r.UName]; % append the variable in the list if not previously listed
+                    Role=[Role {'vector_x'}];
+                    ProjModeRequest=[ProjModeRequest {ProjModeRequestVar}];
+                end
+                if isempty(ind_var_V)
+                    ListVar=[ListVar r.VName];% append the variable in the list if not previously listed
+                    Role=[Role {'vector_y'}];
+                    ProjModeRequest=[ProjModeRequest {ProjModeRequestVar}];
                 end
             end
@@ -101 +110 @@
             errormsg=Field.Txt;
             return
+        end
+        for ilist=3:numel(Field.VarDimName)
+            if isequal(Field.VarDimName{1},Field.VarDimName{ilist})
+                Field.VarAttribute{1}.Role='coord_x';%unstructured coordinates
+                Field.VarAttribute{2}.Role='coord_y';
+                break
+            end
         end
         for ivar=1:numel(ListVar)
@@ -109 +125 @@
             Field.VarAttribute{ivar+2}.ProjModeRequest=ProjModeRequest{ivar};
         end
+
     case 'video'
         if strcmp(class(ParamIn),'VideoReader')