Changeset 236 for trunk/src/read_civxdata.m

Timestamp:

Apr 12, 2011, 12:12:19 AM (13 years ago)

Author:

sommeria

Message:

correct Matlab PIV, remove call to image tool box. Improve menu of uvmat VelType? (replacement of buttons)

File:

• trunk/src/read_civxdata.m (modified) (4 diffs)

trunk/src/read_civxdata.m

@@ -47 +47 @@
 % 'nc2struct': reads a netcdf file 
 
-function [Field,VelTypeOut]=read_civxdata(filename,FieldNames,VelType)
+function [Field,VelTypeOut,errormsg]=read_civxdata(filename,FieldNames,VelType)
+errormsg='';
+DataTest=nc2struct(filename,'ListGlobalAttribute','Conventions');
+if isequal(DataTest.Conventions,'uvmat/civdata')%test for new civ format
+     [Field,VelTypeOut]=read_civdata(filename,FieldNames,VelType);
+     return
+end
+    
 %% default input
 if ~exist('VelType','var')
@@ -64 +71 @@
 [Field,vardetect,ichoice]=nc2struct(filename,var);%read the variables in the netcdf file
 if isfield(Field,'Txt')
+    errormsg=Field.Txt;
     return
 end
 if vardetect(1)==0
-     Field.Txt=[ 'requested field not available in ' filename '/' VelType];
+     errormsg=[ 'requested field not available in ' filename '/' VelType];
      return
 end
@@ -117 +125 @@
         Field.dt=double(Field.dt);
     else
-       Field.Txt='the input file is not civx'; 
+       errormsg='the input file is not civx'; 
        Field.CivStage=0;
        Field.dt=0;
@@ -125 +133 @@
     Field.dt=double(Field.dt2);
 else
-    Field.Txt='the input file is not civx';
+    errormsg='the input file is not civx';
     Field.CivStage=0;
     Field.dt=0;