Changeset 676 for trunk/src/series/merge_proj.m

Timestamp:

Aug 27, 2013, 11:25:59 PM (11 years ago)

Author:

sommeria

Message:

various bugs corrected

File:

• trunk/src/series/merge_proj.m (modified) (8 diffs)

trunk/src/series/merge_proj.m

@@ -129 +129 @@
     diff_time=max(max(diff(time)));
     if diff_time>0 
-        disp_uvmat('WARNING',['times of series differ by (max) ' num2str(diff_time) ': time of first series chosen in result'],checkrun)
+        disp_uvmat('WARNING',['times of series differ by (max) ' num2str(diff_time) ': the mean time is chosen in result'],checkrun)
     end   
 end
+if ~isempty(errormsg)
+    disp_uvmat('WARNING',erromsg,checkrun)
+end
+time=mean(time,1); %averaged time taken for the merged field
 
 %% coordinate transform or other user defined transform
@@ -174 +178 @@
 MaskData=cell(NbView,1);
 if Param.CheckMask
+    if ischar(Param.MaskTable)% case of a single mask (char chain)
+        Param.MaskTable={Param.MaskTable};
+    end
     for iview=1:numel(Param.MaskTable)
         if exist(Param.MaskTable{iview},'file')
@@ -204 +211 @@
     %%%%%%%%%%%%%%%% loop on views (input lines) %%%%%%%%%%%%%%%%
     Data=cell(1,NbView);%initiate the set Data
-    nbtime=0;
+    timeread=zeros(1,NbView);
     for iview=1:NbView
         %% reading input file(s)
@@ -212 +219 @@
             return
         end
-        timeread(iview)=0;
-        if isfield(Data{iview},'Time')
+        % get the time defined in the current file if not already defined from the xml file
+        if ~isempty(time) && isfield(Data{iview},'Time')
             timeread(iview)=Data{iview}.Time;
-            nbtime=nbtime+1;
         end
         if ~isempty(NbSlice_calib)
@@ -258 +264 @@
 
     %% time of the merged field: take the average of the different views
-    if ~isempty(time)% time defined from ImaDoc
-        timeread=time(:,index);
-    end
-    timeread=mean(timeread);
+    if ~isempty(time)
+        timeread=time(index);   
+    elseif ~isempty(find(timeread))% time defined from ImaDoc
+        timeread=mean(timeread(timeread~=0));% take average over times form the files (when defined)
+    else
+        timeread=index;% take time=file index 
+    end
 
     %% generating the name of the merged field
@@ -320 +329 @@
         
     else
-        MergeData.ListGlobalAttribute={'Conventions','Project','InputFile_1','InputFile_end','nb_coord','nb_dim','dt','Time','civ'};
+        MergeData.ListGlobalAttribute={'Conventions','Project','InputFile_1','InputFile_end','nb_coord','nb_dim'};
         MergeData.Conventions='uvmat';
         MergeData.nb_coord=2;
@@ -333 +342 @@
             end
         end
-        if isempty(dt)
-            MergeData.ListGlobalAttribute(6)=[];
-        else
+        if ~isempty(timeread)
+            MergeData.ListGlobalAttribute=[MergeData.ListGlobalAttribute {'Time'}];
+            MergeData.Time=timeread;
+        end
+        if ~isempty(dt)
+            MergeData.ListGlobalAttribute=[MergeData.ListGlobalAttribute {'dt'}];
             MergeData.dt=dt;
         end
-        MergeData.Time=timeread;
         error=struct2nc(OutputFile,MergeData);%save result file
         if isempty(error)
@@ -381 +392 @@
             case 'grid'        %case of fields defined on a structured  grid
                 FFName='';
-                if ~isempty(CellInfo{icell}.VarIndex_errorflag)
+                if isfield(CellInfo{icell},'VarIndex_errorflag') && ~isempty(CellInfo{icell}.VarIndex_errorflag)
                     FFName=Data{1}.ListVarName{CellInfo{icell}.VarIndex_errorflag};% name of errorflag variable
                 end