Changeset 380 for trunk/src/read_civxdata.m

Timestamp:

Jan 29, 2012, 2:31:56 PM (12 years ago)

Author:

sommeria

Message:

reading of civ data, new format, improved: bugs for reading u and v repairedd

File:

• trunk/src/read_civxdata.m (modified) (1 diff)

trunk/src/read_civxdata.m

@@ -49 +49 @@
 function [Field,VelTypeOut,errormsg]=read_civxdata(filename,FieldNames,VelType)
 errormsg='';
-DataTest=nc2struct(filename,'ListGlobalAttribute','Conventions');
+DataTest=nc2struct(filename,'ListGlobalAttribute','Conventions','CivStage');
 if isfield(DataTest,'Txt')
-    errormsg=DataTest.Txt;    
+    errormsg=DataTest.Txt; 
+    return
 elseif isequal(DataTest.Conventions,'uvmat/civdata')%test for new civ format
-     [Field,VelTypeOut]=read_civdata(filename,FieldNames,VelType);
+     [Field,VelTypeOut,errormsg]=read_civdata(filename,FieldNames,VelType,DataTest.CivStage);
+%      if ~isempty(errormsg)
+%          msgbox_uvmat('ERROR',errormsg)
+%      end
      return
 end