Changeset 405 for trunk/src/sub_field.m

Timestamp:

May 1, 2012, 10:08:36 PM (12 years ago)

Author:

sommeria

Message:

many bugs corrected: composition of 2 input fields, arrow colors from different scalar fields...

File:

• trunk/src/sub_field.m (modified) (8 diffs)

trunk/src/sub_field.m

@@ -17 +17 @@
 
 function [SubData,errormsg]=sub_field(Field,Field_1)
+
+%% global attributes
 test_attr=0;
 if isfield(Field,'ListGlobalAttribute')
@@ -22 +24 @@
     for ilist=1:numel(Field.ListGlobalAttribute)
         AttrName=Field.ListGlobalAttribute{ilist};
-        eval(['SubData.' AttrName '=Field.' AttrName ';'])
+        SubData.(AttrName)=Field.(AttrName);
     end
     test_attr=1;
@@ -49 +51 @@
     end
 end
+
+%% variables
 SubData.ListVarName=Field.ListVarName;
 SubData.VarDimName=Field.VarDimName;
@@ -54 +58 @@
     SubData.VarAttribute=Field.VarAttribute;
 end
-%reproduce Field by default
+%reproduce the first field Field by default
 for ivar=1:numel(Field.ListVarName)
    VarName=Field.ListVarName{ivar};
-   eval(['SubData.' VarName '=Field.' VarName ';']) 
-end
-
-%fields     
+   SubData.(VarName)=Field.(VarName);
+end
+
+%% check the two input fields     
 [CellVarIndex,NbDim,VarTypeCell,errormsg]=find_field_indices(Field);
 if ~isempty(errormsg)
@@ -111 +115 @@
 end
 
-%substract two vector fields or two scalars
+%% substract two vector fields or two scalars
 if (testU && testU_1) || (~testU && ~testU_1)
    %check coincidence in positions
@@ -118 +122 @@
        XName=Field.ListVarName{VarType.coord_x};
        YName=Field.ListVarName{VarType.coord_y};
-       eval(['vec_X=Field.' XName ';']) 
-       eval(['vec_Y=Field.' YName ';'])
+       vec_X=Field.(XName);
+       vec_Y=Field.(YName);
        nbpoints=numel(vec_X);
        vec_X=reshape(vec_X,nbpoints,1);
@@ -361 +365 @@
                 VName_1_1=[VName_1 '_1']; 
         end
-    end     
+    end    
+    
     if ~testX_1
           DimCell=[{XName_1_1} {YName_1_1}];
@@ -376 +381 @@
         SubData.VarAttribute=[SubData.VarAttribute {XAttr} {YAttr} {UAttr} {VAttr}];
     end
-    eval(['SubData.' XName_1_1 '=Field_1.' XName_1 ';'])
-    eval(['SubData.' YName_1_1 '=Field_1.' YName_1 ';'])
-    eval(['SubData.' UName_1_1 '=Field_1.' UName_1 ';'])
-    eval(['SubData.' VName_1_1 '=Field_1.' VName_1 ';'])  
+    SubData.(XName_1_1)=Field_1.(XName_1);
+    SubData.(YName_1_1)=Field_1.(YName_1);
+    SubData.(UName_1_1)=Field_1.(UName_1);
+    SubData.(VName_1_1)=Field_1.(VName_1); 
 end