Changeset 906 for trunk/src/sub_field.m

Timestamp:

May 31, 2015, 7:49:31 PM (10 years ago)

Author:

sommeria

Message:

various bgu repairs and ima_remove_partices and ima_remove_background updated

File:

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

trunk/src/sub_field.m

@@ -98 +98 @@
 %% field request
 ProjModeRequest=cell(size(Field.ListVarName));
+if isfield(Field,'VarAttribute')
 for ilist=1:numel(Field.VarAttribute)
     if isfield(Field.VarAttribute{ilist},'ProjModeRequest')
@@ -103 +104 @@
     end
 end
+end
 ProjModeRequest_1=cell(size(Field_1.ListVarName));
+if isfield(Field_1,'VarAttribute')
 for ilist=1:numel(Field_1.VarAttribute)
     if isfield(Field_1.VarAttribute{ilist},'ProjModeRequest')
@@ -109 +112 @@
     end
 end
-
+end
 
 %% rename the dimensions of the second field if identical to those of the first
@@ -162 +165 @@
 check_rename=zeros(size(ListVarNameSub));
 check_remove=zeros(size(ListVarNameSub));
-for ilist=1:numel(ListVarNameSub)
-    ind_prev=find(strcmp(ListVarNameSub{ilist},Field.ListVarName),1);% look for duplicated variable name
-    if ~isempty(ind_prev)% variable name exists in Field
-        if isfield(Field_1.VarAttribute{ilist},'Role')&&...
-            ismember(Field_1.VarAttribute{ilist}.Role,{'coord_x','coord_y','scalar','vector_x','vector_y','errorflag'})
-            ListVarNameNew{ilist}=[ListVarNameSub{ilist} '_1'];%modify the name of the second variable
-            check_rename(ilist)=1;
-        else
-            check_remove(ilist)=1;% variable will be removed
-        end
-    end
-end
-ListVarNameSub=ListVarNameSub(~check_remove); %eliminate removed variables from the list of the second field
-ListVarNameNew=ListVarNameNew(~check_remove); % %list of renaimed varaibles corresponding to ListVarNameSub
-VarDimNameSub=Field_1.VarDimName(~check_remove);
-if numel(Field_1.VarAttribute)<max(find(~check_remove))
-    for ilist=numel(Field_1.VarAttribute)+1:max(find(~check_remove))
-        Field_1.VarAttribute{ilist}={};
-    end
-end
-VarAttributeSub=Field_1.VarAttribute(~check_remove);
-check_rename=check_rename(~check_remove); 
-
+VarDimNameSub={};
+VarAttributeSub={};
+if isfield(Field_1,'VarAttribute')&&~isempty(Field_1.VarAttribute)
+    for ilist=1:numel(ListVarNameSub)
+        ind_prev=find(strcmp(ListVarNameSub{ilist},Field.ListVarName),1);% look for duplicated variable name
+        if ~isempty(ind_prev)% variable name exists in Field
+            if isfield(Field_1.VarAttribute{ilist},'Role')&&...
+                    ismember(Field_1.VarAttribute{ilist}.Role,{'coord_x','coord_y','scalar','vector_x','vector_y','errorflag'})
+                ListVarNameNew{ilist}=[ListVarNameSub{ilist} '_1'];%modify the name of the second variable
+                check_rename(ilist)=1;
+            else
+                check_remove(ilist)=1;% variable will be removed
+            end
+        end
+    end
+    ListVarNameSub=ListVarNameSub(~check_remove); %eliminate removed variables from the list of the second field
+    ListVarNameNew=ListVarNameNew(~check_remove); % %list of renaimed varaibles corresponding to ListVarNameSub
+    VarDimNameSub=Field_1.VarDimName(~check_remove);
+    if numel(Field_1.VarAttribute)<max(find(~check_remove))
+        for ilist=numel(Field_1.VarAttribute)+1:max(find(~check_remove))
+            Field_1.VarAttribute{ilist}={};
+        end
+    end
+    VarAttributeSub=Field_1.VarAttribute(~check_remove);
+    check_rename=check_rename(~check_remove);
+end
 % apply the variable renaming and mark the second field variables with the attribute .CheckSub
 for ilist=1:numel(ListVarNameSub)