Ignore:
Timestamp:
Jun 2, 2022, 11:34:28 AM (23 months ago)
Author:
sommeria
Message:

civ3 reading introduced

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/read_civdata.m

    r1107 r1117  
    222222var={};
    223223switch vel_type
    224     case 'civ1'
    225         var={'X','Y','Z','U','V','W','C','F','FF';...
    226             'Civ1_X','Civ1_Y','Civ1_Z','Civ1_U','Civ1_V','Civ1_W','Civ1_C','Civ1_F','Civ1_FF'};
    227         role={'coord_x','coord_y','coord_z','vector_x','vector_y','vector_z','ancillary','warnflag','errorflag'};
    228     %    units={'pixel','pixel','pixel','pixel','pixel','pixel','','',''};
    229     case 'filter1'
    230         var={'X','Y','Z','U','V','W','C','F','FF','Coord_tps','U_tps','V_tps','W_tps','SubRange','NbCentre','NbCentre','NbCentre';...
    231             'Civ1_X','Civ1_Y','Civ1_Z','Civ1_U_smooth','Civ1_V_smooth','Civ1_W','Civ1_C','Civ1_F','Civ1_FF',...
     224    case{'civ1','civ2','civ3'}
     225        varout={'X','Y','Z','U','V','W','C','F','FF'};
     226        varin= {'Civ1_X','Civ1_Y','Civ1_Z','Civ1_U','Civ1_V','Civ1_W','Civ1_C','Civ1_F','Civ1_FF'};
     227         role={'coord_x','coord_y','coord_z','vector_x','vector_y','vector_z','ancillary','warnflag','errorflag'}; 
     228    case{'filter1','filter2','filter3'} 
     229        varout={'X','Y','Z','U','V','W','C','F','FF','Coord_tps','U_tps','V_tps','W_tps','SubRange','NbCentre','NbCentre','NbCentre'};
     230        varin={'Civ1_X','Civ1_Y','Civ1_Z','Civ1_U_smooth','Civ1_V_smooth','Civ1_W','Civ1_C','Civ1_F','Civ1_FF',...
    232231            'Civ1_Coord_tps','Civ1_U_tps','Civ1_V_tps','Civ1_W_tps','Civ1_SubRange','Civ1_NbCentre','Civ1_NbCentres','Civ1_NbSites'};
    233232        role={'coord_x','coord_y','coord_z','vector_x','vector_y','vector_z','ancillary','warnflag','errorflag','coord_tps','vector_x_tps',...
    234233            'vector_y_tps','vector_z_tps','ancillary','ancillary','ancillary','ancillary'};
    235      %  rmq: NbCentres and NbSites obsolete replaced by NbCentre, kept for consistency with previous data
    236     case 'civ2'
    237         var={'X','Y','Z','U','V','W','C','F','FF';...
    238             'Civ2_X','Civ2_Y','Civ2_Z','Civ2_U','Civ2_V','Civ2_W','Civ2_C','Civ2_F','Civ2_FF'};
    239         role={'coord_x','coord_y','coord_z','vector_x','vector_y','vector_z','ancillary','warnflag','errorflag'};
    240     case 'filter2'
    241         var={'X','Y','Z','U','V','W','C','F','FF','Coord_tps','U_tps','V_tps','W_tps','SubRange','NbCentre','NbCentre','NbCentre';...
    242             'Civ2_X','Civ2_Y','Civ2_Z','Civ2_U_smooth','Civ2_V_smooth','Civ2_W','Civ2_C','Civ2_F','Civ2_FF',...
    243             'Civ2_Coord_tps','Civ2_U_tps','Civ2_V_tps','','Civ2_SubRange','Civ2_NbCentre','Civ2_NbCentres','Civ2_NbSites'};
    244         role={'coord_x','coord_y','coord_z','vector_x','vector_y','vector_z','ancillary','warnflag','errorflag','coord_tps','vector_x_tps',...
    245             'vector_y_tps','vector_z_tps','ancillary','ancillary','ancillary','ancillary'};
    246 end
     234          %  rmq: NbCentres and NbSites obsolete replaced by NbCentre, kept for consistency with previous data
     235end
     236switch vel_type
     237    case {'civ2','filter2'}
     238        varin=regexprep(varin,'1','2');
     239    case {'civ3','filter3'}
     240        varin=regexprep(varin,'1','3');
     241end
     242var=[varout;varin];
    247243if ~strcmp(ProjModeRequest,'interp_tps')
    248244    var=var(:,1:9);%suppress tps if not needed
Note: See TracChangeset for help on using the changeset viewer.