Changeset 761 for trunk/src/series/turb_stat.m

Timestamp:

May 1, 2014, 8:28:05 AM (10 years ago)

Author:

sommeria

Message:

turb_stat corrected
civ corrected to allow civ2 from an existing civ1 series

File:

• trunk/src/series/turb_stat.m (modified) (4 diffs)

trunk/src/series/turb_stat.m

@@ -184 +184 @@
 U2Mean_1=0;
 V2Mean_1=0;
-checkgrid=0;% test for a structured grid for input field
+Counter_1=0;
+
 %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
 for index=1:NbField
@@ -201 +202 @@
         Uprev=Field.U;
         Vprev=Field.V;
-    end
-    FF=isnan(Field.U)|Field.U<-60|Field.U>30;% threshold on U
+        FFprev=Field.FF;
+    end
+    FF=isnan(Field.U);%|Field.U<-60|Field.U>30;% threshold on U
     DataOut.Counter=DataOut.Counter+ (~FF);% add 1 to the couter for non NaN point
+    Counter_1=Counter_1+(~FF & ~FFprev);
     Field.U(FF)=0;% set to 0 the nan values
     Field.V(FF)=0;
@@ -215 +218 @@
     Uprev=Field.U; %store for next iteration
     Vprev=Field.V;
+    FFprev=FF;
 end
 %%%%%%%%%%%%%%%% end loop on field indices %%%%%%%%%%%%%%%%
@@ -224 +228 @@
 V2Mean=V2Mean./DataOut.Counter; % normalize the mean
 UVMean=UVMean./DataOut.Counter; % normalize the mean
-U2Mean_1=U2Mean_1./DataOut.Counter; % normalize the mean
-V2Mean_1=V2Mean_1./DataOut.Counter; % normalize the mean
+U2Mean_1=U2Mean_1./Counter_1; % normalize the mean
+V2Mean_1=V2Mean_1./Counter_1; % normalize the mean
 DataOut.u2Mean=U2Mean-DataOut.UMean.*DataOut.UMean; % normalize the mean
 DataOut.v2Mean=V2Mean-DataOut.VMean.*DataOut.VMean; % normalize the mean