Changeset 650 for trunk/src/calc_field_interp.m

Timestamp:

Jun 17, 2013, 6:46:06 PM (11 years ago)

Author:

sommeria

Message:

bugs corrected: handles.TimeName? in uvmat, 0_OAR emptied for culter computations with series.

File:

• trunk/src/calc_field_interp.m (modified) (1 diff)

trunk/src/calc_field_interp.m

@@ -32 +32 @@
     r=regexp(FieldName{ilist},'(?<Operator>(^vec|^norm|^curl|^div|^strain))\((?<UName>.+),(?<VName>.+)\)$','names');% analyse the field name
     if isempty(r) % the field name is a variable itself
-        ivar=strcmp(FieldName{ilist},Data.ListVarName);
+        ivar=find(strcmp(FieldName{ilist},Data.ListVarName));
         if isempty(ivar)
             check_skipped(ilist)=1; %variable not found
         else
-            if isfield(Data.VarAttribute{ivar},'Role')&&strcmp(Data.VarAttribute{ivar}.Role,'ancillary')
-                check_skipped(ilist)=1; % ancillary variable, not found interpolated      
+            if isfield(Data.VarAttribute{ivar},'Role') &&...
+                (strcmp(Data.VarAttribute{ivar}.Role,'ancillary')||strcmp(Data.VarAttribute{ivar}.Role,'warnflag')||strcmp(Data.VarAttribute{ivar}.Role,'errorflag'))
+                check_skipped(ilist)=1; % ancillary variable, not interpolated      
             elseif isempty(find(strcmp(FieldName{ilist},InputVarList), 1));
                 InputVarList=[InputVarList FieldName{ilist}];% the variable is added to the list of input variables if it is not already in the list