Changeset 93 for trunk/src/read_civxdata.m

Timestamp:

May 27, 2010, 7:25:58 PM (14 years ago)

Author:

sommeria

Message:

FFT: improved to deal with NaN data
merge_proj: corrected to reproduce dt if unique
uvmat.fig: tooltip corrected
plot_field: bug for isocontour corrected,
im_filter: cleaning
phys_polar: spatial derivative included (still to check)
set_obeject.fig: minor correction
struct2nc: comments improved
uvmat: button NB implemented
read_civxdata: error message improved

File:

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

trunk/src/read_civxdata.m

@@ -1 +1 @@
 %'read_civxdata': reads civx data from netcdf files
-%------------------------------------------------------------------
-% COMBINE ET REMPLACE read_ncfield, read_vel et read_scalar_new
 %------------------------------------------------------------------
 % OUTPUT:
@@ -20 +18 @@
 %            .CoordType: expresses the type of coordinate ('px' for image, 'sig' for instruments, or 'phys')
 %            .dt: time interval for the corresponding image pair
-%            .CivStage: =0, ??? A UTILISER POUR REMPLACER civ
-        %           =1, civ1 has been performed only
-        %           =2, fix1 has been performed
-        %           =3, pacth1 has been performed
-        %           =4, civ2 has been performed 
-        %           =5, fix2 has been performed
-        %           =6, pacth2 has been performed
+%            .CivStage: =0, 
+%                   =1, civ1 has been performed only
+%                   =2, fix1 has been performed
+%                   =3, pacth1 has been performed
+%                   =4, civ2 has been performed 
+%                   =5, fix2 has been performed
+%                   =6, pacth2 has been performed
 %            .X, .Y, .Z: set of vector coordinates 
 %            .U,.V,.W: corresponding set of vector components
@@ -37 +35 @@
 %            .A, .AX, .AY: additional scalar
 % dt:time interval of the image pair red from a single file, or vector with
- 
 % pixcmx,pixcmy: scaling factors (from the first file)
 % vel_type_out: string representing the selected velocity type (civ1,civ2,filter1...)
@@ -68 +65 @@
     FieldNames=[]; %default
 end
-
 VelTypeOut=VelType;%default
 [var,role,units,vel_type_out_cell]=varcivx_generator(FieldNames,VelType);%determine the names of constants and variables to read
@@ -76 +72 @@
 end
 if isequal(vardetect,0)
-     Field.Txt=[FieldNames ' not accessible in ' filename '/' VelType];
+     Field.Txt=[reshape(FieldNames,1,numel(FieldNames)) ' not accessible in ' filename '/' VelType];
      return
 end