Changeset 550 for trunk/src/series

Timestamp:

Oct 11, 2012, 10:07:12 AM (12 years ago)

Author:

sommeria

Message:

merge_proj updated to account for new format in field transform (variable nbre of input parma)

Location:

trunk/src/series

Files:

• merge_proj.m (modified) (3 diffs)
• time_series.m (modified) (1 diff)

trunk/src/series/merge_proj.m

@@ -80 +80 @@
 end
 ParamOut=Param; %default output
+if ~isfield(Param,'InputFields')
+    Param.InputFields.FieldName='';
+end
 OutputSubDir=[Param.OutputSubDir Param.OutputDirExt];
 
@@ -210 +213 @@
             %transform the input field (e.g; phys) if requested
             if ~isempty(transform_fct)
-                Data{iview}=transform_fct(Data{iview},XmlData{iview});  %transform to phys if requested
+                switch nargin(transform_fct)
+                    case {2,3,4}
+                       Data{iview}=transform_fct(Data{iview},XmlData{iview});
+                    case 1
+                        Data{iview}=transform_fct(Data{iview});
+                end
             end
             
@@ -311 +319 @@
             GeometryCal.Tx_Ty_Tz=[T_x T_y 1];
             ImaDoc.GeometryCalib=GeometryCal;
-            t=struct2xml(ImaDoc);
-            t=set(t,1,'name','ImaDoc');
-            save(t,[filebase_merge '.xml'])
-            display([filebase_merge '.xml saved'])
+%             t=struct2xml(ImaDoc);
+%             t=set(t,1,'name','ImaDoc');
+%             save(t,[filebase_merge '.xml'])
+%             display([filebase_merge '.xml saved'])
         else
             MergeData.ListGlobalAttribute={'Conventions','Project','InputFile_1','InputFile_end','nb_coord','nb_dim','dt','Time','civ'};

trunk/src/series/time_series.m

@@ -350 +350 @@
                     end
                 elseif testsum(ivar)==1% variable representing fixed coordinates
-                    eval(['VarInit=DataOut.' VarName ';']);
+                    VarInit=DataOut.(VarName);
                     if isempty(errormsg) && ~isequal(VarVal,VarInit)
                         displ_uvmat('ERROR',['time series requires constant coordinates ' VarName],checkrun)