Changeset 858 for trunk/src/series/civ_series.m

Timestamp:

Jan 26, 2015, 7:43:23 PM (9 years ago)

Author:

sommeria

Message:

bugs_corrected

File:

• trunk/src/series/civ_series.m (modified) (3 diffs)

trunk/src/series/civ_series.m

@@ -671 +671 @@
             V_tps=par_civ2.Civ1_V_tps;
             Civ1_Dt=par_civ2.Civ1_Dt;
+            Civ2_Dt=par_civ2.Civ1_Dt;
                          Data.ListVarName={};
                 Data.VarDimName={};
@@ -709 +710 @@
         par_civ2.SearchBoxSize(1)=2*ibx2+9;% search ara +-4 pixels around the guess
         par_civ2.SearchBoxSize(2)=2*iby2+9;
-        if strcmp(Param.ActionInput.ListCompareMode,'displacement')
-            Civ1_Dt=1;
-            Civ2_Dt=1;
-        elseif exist('time','var')
-            Civ2_Dt=time(i2+1,j2+1)-time(i1+1,j1+1);
-        else 
-            Civ2_Dt=1;%TO CHECK, TEST
+        if CheckInputFile % else Dt given by par_civ2
+            if strcmp(Param.ActionInput.ListCompareMode,'displacement')
+                Civ1_Dt=1;
+                Civ2_Dt=1;
+            else
+                Civ2_Dt=time(i2+1,j2+1)-time(i1+1,j1+1);
+            end
         end
         par_civ2.SearchBoxShift=(Civ2_Dt/Civ1_Dt)*[Shiftx(nbval>=1)./nbval(nbval>=1) Shifty(nbval>=1)./nbval(nbval>=1)];
@@ -725 +726 @@
             par_civ2.DVDY=DVDY./nbval;
         end
+        par_civ2
         % calculate velocity data (y and v in indices, reverse to y component)
         [xtable, ytable, utable, vtable, ctable, F,result_conv,errormsg] = civ (par_civ2);