Changeset 635 for trunk/src/series/aver_stat.m

Timestamp:

May 19, 2013, 11:37:49 PM (11 years ago)

Author:

sommeria

Message:

 

File:

• trunk/src/series/aver_stat.m (modified) (6 diffs)

trunk/src/series/aver_stat.m

@@ -94 +94 @@
 nbfield_i=size(i1_series{1},2); %nb of fields for the i index
 nbfield=nbfield_j*nbfield_i; %total number of fields
-[first_i,tild,last_i,first_j,tild,last_j,errormsg]=get_index_range(Param.IndexRange);
-if ~isempty(errormsg),display(errormsg),return,end
 
 %% determine the file type on each line from the first input file 
@@ -140 +138 @@
 elseif CheckNc{1}
     FileExtOut='.nc';% write result as .nc files for netcdf inputs
-else 
+else
     msgbox_uvmat('ERROR',['invalid file type input ' FileType{1}])
     return
 end
 if nbview==2 && ~isequal(CheckImage{1},CheckImage{2})
-        msgbox_uvmat('ERROR','input must be two image series or two netcdf file series')
+    msgbox_uvmat('ERROR','input must be two image series or two netcdf file series')
     return
 end
-%NomTypeOut='_1-2_1';% output file index will indicate the first and last ref index in the series
+
+%% settings for the output file
 NomTypeOut=nomtype2pair(NomType{1});% determine the index nomenclature type for the output file
+first_i=i1_series{1}(1);
+last_i=i1_series{1}(end);
+if isempty(j1_series{1})% if there is no second index j
+    first_j=1;last_j=1;
+else
+    first_j=j1_series{1}(1);
+    last_j=j1_series{1}(end);
+end
 
 %% Set field names and velocity types
@@ -177 +184 @@
 for index=1:nbfield
     update_waitbar(WaitbarHandle,index/nbfield)
-    if ~isempty(RUNHandle)&& ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+    if ~isempty(RUNHandle)&& ~strcmp(get(RUNHandle,'BusyAction'),'queue')
         disp('program stopped by user')
         break
@@ -238 +245 @@
         
         %%%%%%%%%%%% MAIN RUNNING OPERATIONS  %%%%%%%%%%%%
-        %update sum
         if nbfiles==1 %first field
             time_1=[];
@@ -255 +261 @@
                 siz=size(Field.(VarName));
                 if ~isequal(DataOut.(VarName),0)&& ~isequal(siz,sizmean)
-                    msgbox_uvmat('ERROR',['unequal size of input field ' VarName ', need to project  on a grid'])
+                    displ_uvmat('ERROR',['unequal size of input field ' VarName ', need to project  on a grid'],checkrun)
                     return
                 else
@@ -285 +291 @@
     end
 else  % time from ImaDoc prevails if it exists
-    %         j1=1;%default
-    %         if ~isempty(j1_series{1})
-    %             j1=j1_series{1};
-    %         end
-    %DataOut.Time=time(1,i1_series{1}(1),j1);
-    %DataOut.Time_end=time(end,i1_series{end}(end),j1_series{end}(end));
     DataOut.Time=time(1);
     DataOut.Time_end=time(end);