Changeset 221 for trunk/src/uvmat.m

Timestamp:

Mar 12, 2011, 11:11:01 PM (14 years ago)

Author:

sommeria

Message:

various bug corrections.

File:

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

trunk/src/uvmat.m

@@ -948 +948 @@
 set(handles.frame_j,'Visible',state_j);
 set(handles.j_text,'Visible',state_j);
+if strcmp(state_j,'on')
+    set(handles.fix_pair,'Visible','on')
+else
+    set(handles.fix_pair,'Visible','off')
+end
 
 %% view the field  
@@ -1386 +1391 @@
     set(handles.scan_i,'Value',0)
     set(handles.scan_i,'BackgroundColor',[0.831 0.816 0.784])
-    NomType=get(handles.FileIndex,'UserData');
+    NomType=get(handles.FileIndex,'UserData')
     switch NomType
     case {'_i_j1-j2','#_ab','%3dab'},% pair with j index
@@ -2115 +2120 @@
         index_fields=get(handles.Fields,'Value');% selected string index
         FieldName= list_fields{index_fields}; % selected field
-        if ~strcmp(FieldName,'get_field...')% read the field names on the interface get_field...
-           VelType=setfield(handles);
+        if ~strcmp(FieldName,'get_field...')
+           VelType=setfield(handles);% read the velocity type.
         end
         if strcmp(FieldName,'velocity')
@@ -2464 +2469 @@
             UvData.Field.ZMin=ZMin;
         else
-            UvData.Field.Mesh=sqrt(DX*DY);
+            UvData.Field.Mesh=DX;%sqrt(DX*DY);
         end
     end
@@ -2711 +2716 @@
 %% display time
 testimedoc=0;
+TimeUnit='';
+if isfield(UvData.Field,'Time')
+    abstime=UvData.Field.Time;%time read from the netcdf input file 
+end
+if isfield(UvData,'Field_1') && isfield(UvData.Field_1,'Time')
+    abstime_1=UvData.Field_1.Time;%time read from the netcdf input file 
+end
+if isfield(UvData.Field,'dt')
+    dt=UvData.Field.dt;%dt read from the netcdf input file
+    if isfield(UvData.Field,'TimeUnit')
+       TimeUnit=UvData.Field.TimeUnit;
+    end
+elseif isfield(UvData,'Field_1') && isfield(UvData.Field_1,'dt')%dt obtained from the second field if not defined in the first
+    dt=UvData.Field_1.dt;%dt read from the netcdf input file
+    if isfield(UvData.Field_1,'TimeUnit')
+       TimeUnit=UvData.Field_1.TimeUnit;
+    end
+end
+% time from xml file overset previous result
 if isfield(UvData,'XmlData') && isfield(UvData.XmlData,'Time')
     if isempty(num_i2)||isnan(num_i2)
@@ -2726 +2750 @@
         dt=(UvData.XmlData.Time(num_i2,num_j2)-UvData.XmlData.Time(num_i1,num_j1));
         testimedoc=1;
+        if isfield(UvData.XmlData,'TimeUnit')
+            TimeUnit=UvData.XmlData.TimeUnit;
+        end
     end
 end
@@ -2756 +2783 @@
     set(handles.Dt_txt,'String','')
 else
-    if ~(isfield(UvData,'TimeUnit') && ~isempty(UvData.TimeUnit))
+    if  isempty(TimeUnit)
         set(handles.Dt_txt,'String',['Dt=' num2str(1000*dt,3) '  10^(-3)'] )
     else
-        set(handles.Dt_txt,'String',['Dt=' num2str(1000*dt,3) '  m' UvData.TimeUnit] )
+        set(handles.Dt_txt,'String',['Dt=' num2str(1000*dt,3) '  m' TimeUnit] )
     end
 end