Changeset 752 for trunk/src/get_file_type.m

Timestamp:

Apr 27, 2014, 8:14:51 PM (10 years ago)

Author:

sommeria

Message:

various update

File:

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

trunk/src/get_file_type.m

@@ -55 +55 @@
                     error_nc=0;
                     try
-                        Data=nc2struct(fileinput,'ListGlobalAttribute','absolut_time_T0','Conventions',...
-                            'CivStage','patch2','fix2','civ2','patch','fix');
-                        if isfield(Data,'Txt') && ~isempty(Data.Txt)
+                        [Data,tild,tild,errormsg]=nc2struct(fileinput,'ListGlobalAttribute','absolut_time_T0','Conventions',...
+                            'CivStage','patch2','fix2','civ2','patch','fix','hart');
+                        if ~isempty(errormsg)
                             error_nc=1;
                         else
-                            if ~isempty(Data.absolut_time_T0')
+                            if ~isempty(Data.absolut_time_T0') && ~isempty(Data.hart)
                                 FileType='civx'; % test for civx velocity fields
-                                if ~isempty(Data.patch2) && isequal(Data.patch2,1)
+                                if isequal(Data.patch2,1)
                                     FileInfo.CivStage=6;
-                                elseif ~isempty(Data.fix2) && isequal(Data.fix2,1)
+                                elseif isequal(Data.fix2,1)
                                     FileInfo.CivStage=5;
-                                elseif ~isempty(Data.civ2) && isequal(Data.civ2,1);
+                                elseif  isequal(Data.civ2,1)
                                     FileInfo.CivStage=4;
-                                elseif ~isempty(Data.patch) && isequal(Data.patch,1);
+                                elseif isequal(Data.patch,1)
                                     FileInfo.CivStage=3;
-                                elseif ~isempty(Data.fix) && isequal(Data.fix,1);
+                                elseif isequal(Data.fix,1)
                                     FileInfo.CivStage=2;
-                                elseif ~isempty(Data.absolut_time_T0) && ~isempty(Data.hart)
+                                else
                                     FileInfo.CivStage=1;
                                 end