Changeset 338 for trunk/src


Ignore:
Timestamp:
Dec 16, 2011, 4:04:36 PM (13 years ago)
Author:
gostiaux
Message:

one commented line was missing

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ_matlab.m

    r337 r338  
    5454    check_civ1=1;% test for further use of civ1 results
    5555    % caluclate velocity data (y and v in indices, reverse to y component)
    56     [xtable1 ytable1 utable1 vtable1 ctable1 F1 result_conv1 errormsg1] = civ (Param.Civ1);
    57 
    58     % to try the reverse_pair method, uncomment below
     56    [xtable ytable utable vtable ctable F result_conv errormsg] = civ (Param.Civ1);
     57
     58%    % to try the reverse_pair method, uncomment below
     59%     [xtable1 ytable1 utable1 vtable1 ctable1 F1 result_conv1 errormsg1] = civ (Param.Civ1);
    5960%     Param.Civ1.reverse_pair=1;
    6061%     [xtable2 ytable2 utable2 vtable2 ctable2 F2 result_conv2 errormsg2] = civ (Param.Civ1);
    61 
    62     xtable=[xtable1; xtable2];
    63     ytable=[ytable1; ytable2];
    64     utable=[utable1; -utable2];
    65     vtable=[vtable1; -vtable2];
    66     ctable=[ctable1; ctable2];
    67     F=[F1; F2];
    68     result_conv=[result_conv1; result_conv2];
    69     errormsg=[errormsg1; errormsg2];
     62%     xtable=[xtable1; xtable2];
     63%     ytable=[ytable1; ytable2];
     64%     utable=[utable1; -utable2];
     65%     vtable=[vtable1; -vtable2];
     66%     ctable=[ctable1; ctable2];
     67%     F=[F1; F2];
     68%     result_conv=[result_conv1; result_conv2];
     69%     errormsg=[errormsg1; errormsg2];
    7070   
    71 %     xtable=mean(xtable1,xtable2);
    72 %     ytable=mean(ytable1,ytable2);
    73 %     utable=mean(utable1,utable2);
    74 %     vtable=mean(vtable1,vtable2);   
    7571   
    7672    if ~isempty(errormsg)
Note: See TracChangeset for help on using the changeset viewer.