Changeset 420 for trunk

Timestamp:

May 9, 2012, 11:03:37 PM (13 years ago)

Author:

sommeria

Message:

bugs corrected for series: error display in case of input error
;

Location:

trunk/src

Files:

• read_civxdata.m (modified) (1 diff)
• series/aver_stat.m (modified) (1 diff)

trunk/src/read_civxdata.m

@@ -49 +49 @@
 function [Field,VelTypeOut,errormsg]=read_civxdata(filename,FieldNames,VelType)
 errormsg='';
+Field=[];
+VelTypeOut=[];
 DataTest=nc2struct(filename,'ListGlobalAttribute','Conventions','CivStage');
 if isfield(DataTest,'Txt')

trunk/src/series/aver_stat.m

@@ -347 +347 @@
                     Data{iview}.CoordUnit='pixel';
                 elseif testcivx
-                    [Data{iview},VelTypeOut]=read_civxdata(filename,FieldName,VelType);
+                    [Data{iview},VelTypeOut,errormsg]=read_civxdata(filename,FieldName,VelType);
+                    if ~isempty(errormsg)
+                          msgbox_uvmat('ERROR',['error of input reading: ' errormsg])
+                    return
+                    end
                 else
                     [Data{iview},var_detect]=nc2struct(filename,SubField.ListVarName); %read the corresponding input data