Changeset 338 for trunk/src

Timestamp:

Dec 16, 2011, 4:04:36 PM (13 years ago)

Author:

gostiaux

Message:

one commented line was missing

File:

• trunk/src/civ_matlab.m (modified) (1 diff)

trunk/src/civ_matlab.m

@@ -54 +54 @@
     check_civ1=1;% test for further use of civ1 results
     % caluclate velocity data (y and v in indices, reverse to y component)
-    [xtable1 ytable1 utable1 vtable1 ctable1 F1 result_conv1 errormsg1] = civ (Param.Civ1);
-
-    % to try the reverse_pair method, uncomment below
+    [xtable ytable utable vtable ctable F result_conv errormsg] = civ (Param.Civ1);
+
+%    % to try the reverse_pair method, uncomment below
+%     [xtable1 ytable1 utable1 vtable1 ctable1 F1 result_conv1 errormsg1] = civ (Param.Civ1);
 %     Param.Civ1.reverse_pair=1;
 %     [xtable2 ytable2 utable2 vtable2 ctable2 F2 result_conv2 errormsg2] = civ (Param.Civ1);
-
-    xtable=[xtable1; xtable2];
-    ytable=[ytable1; ytable2];
-    utable=[utable1; -utable2];
-    vtable=[vtable1; -vtable2];
-    ctable=[ctable1; ctable2];
-    F=[F1; F2];
-    result_conv=[result_conv1; result_conv2];
-    errormsg=[errormsg1; errormsg2];
+%     xtable=[xtable1; xtable2];
+%     ytable=[ytable1; ytable2];
+%     utable=[utable1; -utable2];
+%     vtable=[vtable1; -vtable2];
+%     ctable=[ctable1; ctable2];
+%     F=[F1; F2];
+%     result_conv=[result_conv1; result_conv2];
+%     errormsg=[errormsg1; errormsg2];
     
-%     xtable=mean(xtable1,xtable2);
-%     ytable=mean(ytable1,ytable2);
-%     utable=mean(utable1,utable2);
-%     vtable=mean(vtable1,vtable2);    
     
     if ~isempty(errormsg)