Changeset 580 for trunk/src/sub_field.m

Timestamp:

Mar 7, 2013, 1:47:51 PM (12 years ago)

Author:

sommeria

Message:

bugs corrected for combining fields

File:

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

trunk/src/sub_field.m

@@ -105 +105 @@
 end
 
-%look for coordinates common to Field in Field_1
+%% look for coordinates common to Field in Field_1
 ind_remove=zeros(size(Field_1.ListVarName));
 for ilist=1:numel(Field_1.ListVarName)
@@ -121 +121 @@
                    NewDim={NewDim};
                end
-               Field_1.VarDimName=regexprep_r(Field_1.VarDimName,OldDim{1},NewDim{1});
+               Field_1.VarDimName=regexprep_r(Field_1.VarDimName,['^' OldDim{1} '$'],NewDim{1});
             end
         end
@@ -130 +130 @@
 Field_1.VarAttribute(find(ind_remove))=[];
 
-%append the other variables of the second field, modifying their name if needed
+%% append the other variables of the second field, modifying their name if needed
 for ilist=1:numel(Field_1.ListVarName)
     VarName=Field_1.ListVarName{ilist};
@@ -138 +138 @@
     else  % variable name exists in Field     
             VarNameNew=[VarName '_1'];   
+            if isfield(Field_1.VarAttribute{ilist},'FieldName')
+                Field_1.VarAttribute{ilist}.FieldName=regexprep_r(Field_1.VarAttribute{ilist}.FieldName,VarName,VarNameNew);
+            end
     end
         SubData.ListVarName=[SubData.ListVarName {VarNameNew}];
@@ -146 +149 @@
 end
 
-%append the other variables of the second field, modifying their name if needed
-
 %% substrat fields when possible
 %[CellVarIndex,NbDim,CellVarType,errormsg]=find_field_cells(SubData);
-[CellInfo,NbDim,errormsg]=find_field_cells(SubData)
+[CellInfo,NbDim,errormsg]=find_field_cells(SubData);
 ind_remove=zeros(size(SubData.ListVarName));
 ivar=[];
@@ -179 +180 @@
 SubData.VarDimName(find(ind_remove))=[];
 SubData.VarAttribute(find(ind_remove))=[];
+%end
 
-function OutputCell=regexprep_r(InputCell,dimname,dimname_new)
+function OutputCell=regexprep_r(InputCell,search_string,new_string)
 for icell=1:numel(InputCell)
-    OutputCell{icell}=regexprep(InputCell{icell},['^' dimname '$'],dimname_new);
+    OutputCell{icell}=regexprep(InputCell{icell},search_string,new_string);
 end