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

Timestamp:

Feb 12, 2015, 9:31:47 PM (9 years ago)

Author:

sommeria

Message:

python option added in series and bug corrections

File:

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

trunk/src/series/aver_stat.m

@@ -136 +136 @@
 for iview=1:NbView
     if ~exist(filecell{iview,1}','file')
-        msgbox_uvmat('ERROR',['the first input file ' filecell{iview,1} ' does not exist'])
+        disp_uvmat('ERROR',['the first input file ' filecell{iview,1} ' does not exist'],checkrun)
         return
     end
@@ -155 +155 @@
     diff_time=max(max(diff(time)));
     if diff_time>0
-        msgbox_uvmat('WARNING',['times of series differ by (max) ' num2str(diff_time)])
+        disp_uvmat('WARNING',['times of series differ by (max) ' num2str(diff_time)],checkrun)
     end   
 end
@@ -176 +176 @@
     FileExtOut='.nc';% write result as .nc files for netcdf inputs
 else
-    msgbox_uvmat('ERROR',['invalid file type input ' FileType{1}])
+    disp_uvmat('ERROR',['invalid file type input ' FileType{1}],checkrun)
     return
 end
 if NbView==2 && ~isequal(CheckImage{1},CheckImage{2})
-    msgbox_uvmat('ERROR','input must be two image series or two netcdf file series')
+    disp_uvmat('ERROR','input must be two image series or two netcdf file series',checkrun)
     return
 end
@@ -216 +216 @@
 % index_slice=i_slice:NbSlice:nbfield;% select file indices of the slice
 nbfiles=0;
-nbmissing=0;
+% nbmissing=0;
 
 %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
@@ -275 +275 @@
             [Field,errormsg]=proj_field(Field,Param.ProjObject);
             if ~isempty(errormsg)
-                msgbox_uvmat('ERROR',['error in aver_stat/proj_field:' errormsg])
+                disp_uvmat('ERROR',['error in aver_stat/proj_field:' errormsg],checkrun)
                 return
             end
@@ -289 +289 @@
             DataOut=Field;%default
             DataOut.Conventions='uvmat'; %suppress Conventions='uvmat/civdata' for civ input files
-            for ivar=1:length(Field.ListVarName)
+            errorvar=zeros(numel(Field.ListVarName));%index of errorflag associated to each variable
+            for ivar=1:numel(Field.ListVarName)
                 VarName=Field.ListVarName{ivar};
-                DataOut.(VarName)=double(DataOut.(VarName));
-            end
-        else   %current field
-            for ivar=1:length(Field.ListVarName)
-                VarName=Field.ListVarName{ivar};
-                sizmean=size(DataOut.(VarName));
-                siz=size(Field.(VarName));
-                if ~isequal(DataOut.(VarName),0)&& ~isequal(siz,sizmean)
-                    disp_uvmat('ERROR',['unequal size of input field ' VarName ', need to project  on a grid'],checkrun)
-                    return
+                DataOut.(VarName)=zeros(size(DataOut.(VarName)));% initiate each field to zero
+                NbData.(VarName)=zeros(size(DataOut.(VarName)));% initiate the nbre of good data to zero
+                for iivar=1:length(Field.VarAttribute)
+                    if isequal(Field.VarDimName{iivar},Field.VarDimName{ivar})&& isfield(Field.VarAttribute{iivar},'Role')...
+                            && strcmp(Field.VarAttribute{iivar}.Role,'errorflag')
+                        errorvar(ivar)=iivar; % index of the errorflag variable corresponding to ivar
+                    end
+                end
+            end
+            DataOut.ListVarName(errorvar(errorvar~=0))=[]; %remove errorflag from result
+            DataOut.VarDimName(errorvar(errorvar~=0))=[]; %remove errorflag from result
+            DataOut.VarAttribute(errorvar(errorvar~=0))=[]; %remove errorflag from result
+        end   %current field
+        for ivar=1:length(DataOut.ListVarName)
+            VarName=Field.ListVarName{ivar};
+            sizmean=size(DataOut.(VarName));
+            siz=size(Field.(VarName));
+            if ~isequal(DataOut.(VarName),0)&& ~isequal(siz,sizmean)
+                disp_uvmat('ERROR',['unequal size of input field ' VarName ', need to project  on a grid'],checkrun)
+                return
+            else
+                if errorvar(ivar)==0
+                    check_bad=isnan(Field.(VarName));%=0 for NaN data values, 1 else
                 else
-                    DataOut.(VarName)=DataOut.(VarName)+ double(Field.(VarName)); % update the sum
+                    check_bad=isnan(Field.(VarName)) | Field.(Field.ListVarName{errorvar(ivar)})~=0;%=0 for NaN or error flagged data values, 1 else
                 end
+                Field.(VarName)(check_bad)=0; %set to zero NaN or data marked by error flag
+                DataOut.(VarName)=DataOut.(VarName)+ double(Field.(VarName)); % update the sum
+                NbData.(VarName)=NbData.(VarName)+ ~check_bad;% records the number of data for each point
             end
         end
@@ -315 +332 @@
 for ivar=1:length(Field.ListVarName)
     VarName=Field.ListVarName{ivar};
-    DataOut.(VarName)=DataOut.(VarName)/nbfiles; % normalize the mean
-end
+    DataOut.(VarName)=DataOut.(VarName)./NbData.(VarName); % normalize the mean
+end
+nbmissing=NbField-nbfiles;
 if nbmissing~=0
-    msgbox_uvmat('WARNING',[num2str(nbmissing) ' input files are missing or skipted'])
+    disp_uvmat('WARNING',[num2str(nbmissing) ' input files are missing or skipted'],checkrun)
 end
 if isempty(time) % time is read from files