Changeset 890 for trunk/src/uvmat.m

Timestamp:

Apr 18, 2015, 11:03:01 PM (8 years ago)

Author:

sommeria

Message:

bugs solved for reading general netcdf files

File:

• trunk/src/uvmat.m (modified) (6 diffs)

trunk/src/uvmat.m

@@ -3249 +3249 @@
     ParamIn.Coord_y=get(handles.Coord_y,'String');
     ParamIn.Coord_z=get(handles.Coord_z,'String');
+    ParamIn.CheckCoordIndex=strcmp(get(handles.SwitchCoordIndex,'String'),'dim');
     TimeName=get(handles.TimeName,'String');
     r=regexp(TimeName,'^(?<type>(dim:)|(var:))','names');%look for 'var:' or 'dim:' at the beginning of time name
@@ -3260 +3261 @@
     end 
 end
-% check_tps = 0;         
-% if strcmp(UvData.FileType{1},'civdata')&&~strcmp(ParamIn.FieldName,'velocity')&&~strcmp(ParamIn.FieldName,'get_field...') 
-%        check_tps=1;%tps needed to get the requested field
-% end
+
 [Field{1},ParamOut,errormsg] = read_field(FileName,UvData.FileType{1},ParamIn,frame_index);
 if ~isempty(errormsg)
@@ -4270 +4268 @@
         FieldList={};
         VecColorList={''};
+        XName='';
+        YName='';
         ZName='';
         switch GetFieldData.FieldOption
@@ -4275 +4275 @@
                 UName=GetFieldData.PanelVectors.vector_x;
                 VName=GetFieldData.PanelVectors.vector_y;
-                YName=GetFieldData.Coordinates.Coord_y;
-                if isfield(GetFieldData.Coordinates,'Coord_z')
-                ZName=GetFieldData.Coordinates.Coord_z;
-                end
+                if isfield(GetFieldData,'Coordinates')
+                    YName=GetFieldData.Coordinates.Coord_y;
+                    if isfield(GetFieldData.Coordinates,'Coord_z')
+                        ZName=GetFieldData.Coordinates.Coord_z;
+                    end
+                end              
                 CName=GetFieldData.PanelVectors.vec_color;
                 FieldList={['vec(' UName ',' VName ')'];...
@@ -4290 +4292 @@
             case 'scalar'
                 AName=GetFieldData.PanelScalar.scalar;
-                YName=GetFieldData.Coordinates.Coord_y;
-                if isfield(GetFieldData.Coordinates,'Coord_z')
-                ZName=GetFieldData.Coordinates.Coord_z;
+                if isfield(GetFieldData,'Coordinates')
+                    YName=GetFieldData.Coordinates.Coord_y;
+                    if isfield(GetFieldData.Coordinates,'Coord_z')
+                        ZName=GetFieldData.Coordinates.Coord_z;
+                    end
                 end
                 FieldList={AName};
@@ -4302 +4306 @@
         % get time as file index, attribute, variable or matrix index
         if ~strcmp(GetFieldData.FieldOption,'civdata...')
-            XName=GetFieldData.Coordinates.Coord_x;
+            if isfield(GetFieldData,'Coordinates')
+                XName=GetFieldData.Coordinates.Coord_x;
+                set(handles.SwitchCoordIndex,'String','var'); % variable used as coordinate
+            else
+                set(handles.SwitchCoordIndex,'String','dim'); % matrix index used a coordinate
+            end
             TimeNameStr=GetFieldData.Time.SwitchVarIndexTime;
             switch TimeNameStr