Changeset 1095 for trunk/src/series/sliding_average.m

Timestamp:

Mar 31, 2021, 3:32:03 PM (4 years ago)

Author:

sommeria

Message:

reading mat files added, +-fixed,OpenDAP improved

File:

• trunk/src/series/sliding_average.m (modified) (8 diffs)

trunk/src/series/sliding_average.m

@@ -121 +121 @@
         return
     end
-    [FileInfo{iview},MovieObject{iview}]=get_file_info(filecell{iview,1});900
+    [FileInfo{iview},MovieObject{iview}]=get_file_info(filecell{iview,1});
     FileType{iview}=FileInfo{iview}.FileType;
     CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
@@ -137 +137 @@
 if size(time,1)>1
     diff_time=max(max(diff(time)));
-    if diff_time>0series
+    if diff_time>0
         msgbox_uvmat('WARNING',['times of series differ by (max) ' num2str(diff_time)])
     end   
@@ -185 +185 @@
 
 %% initialisation
-T=24.2; %main wave period
+T=24.4; %main wave period
 t0=3; % time for motion start (torus at its maximum x)
 NbPeriod=2; %number of periods for the sliding average
@@ -195 +195 @@
 DataOut.ListGlobalAttribute= {'Conventions','Time'};
 DataOut.Conventions='uvmat';
-DataOut.ListVarName={'coord_y','coord_x','Umean','Vmean','Ucos','Vcos','DUDXsin','DUDXcos','DUDYsin','DVDXsin','DVDXcos'...
+DataOut.ListVarName={'coord_y','coord_x','Umean','Vmean','Ucos','Vcos','Usin','Vsin','DUDXsin','DUDXcos','DUDYsin','DVDXsin','DVDXcos'...
     ,'DVDYsin','Ustokes','Vstokes'};
 DataOut.VarDimName={'coord_y','coord_x',{'coord_y','coord_x'},{'coord_y','coord_x'},{'coord_y','coord_x'},{'coord_y','coord_x'},...
     {'coord_y','coord_x'},{'coord_y','coord_x'},{'coord_y','coord_x'},{'coord_y','coord_x'},{'coord_y','coord_x'},...
-    {'coord_y','coord_x'},{'coord_y','coord_x'},{'coord_y','coord_x'}};
+    {'coord_y','coord_x'},{'coord_y','coord_x'},{'coord_y','coord_x'},{'coord_y','coord_x'},{'coord_y','coord_x'}};
 
 %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
@@ -237 +237 @@
         Ucos=zeros(NpTime,npy,npx);
         Vcos=zeros(NpTime,npy,npx);
+        Usin=zeros(NpTime,npy,npx);
+        Vsin=zeros(NpTime,npy,npx);
         DUDXcos=zeros(NpTime,npy,npx);
         DUDXsin=zeros(NpTime,npy,npx);
@@ -249 +251 @@
     Ucos=circshift(Ucos,[-1 0 0]); %shift U by ishift along the first index
     Vcos=circshift(Vcos,[-1 0 0]); %shift U by ishift along the first index
+    Usin=circshift(Usin,[-1 0 0]); %shift U by ishift along the first index
+    Vsin=circshift(Vsin,[-1 0 0]); %shift U by ishift along the first index
     DUDXcos=circshift(DUDXcos,[-1 0 0]);
     DUDXsin=circshift(DUDXsin,[-1 0 0]);
@@ -259 +263 @@
     Ucos(end,:,:)=Field.U*cos(omega*Time(index));
     Vcos(end,:,:)=Field.V*cos(omega*Time(index));
+    Usin(end,:,:)=Field.U*sin(omega*Time(index));
+    Vsin(end,:,:)=Field.V*sin(omega*Time(index));
     DUDXcos(end,:,:)=Field.DUDX*cos(omega*Time(index));
     DUDXsin(end,:,:)=Field.DUDX*sin(omega*Time(index));
@@ -269 +275 @@
     DataOut.Umean=(1/Uscale)*squeeze(nanmean(Umean,1));
     DataOut.Vmean=(1/Uscale)*squeeze(nanmean(Vmean,1));
-    DataOut.Ucos=2*squeeze(nanmean(Ucos,1));
-    DataOut.Vcos=2*squeeze(nanmean(Vcos,1));
+    DataOut.Ucos=2*(1/Uscale)*squeeze(nanmean(Ucos,1));
+    DataOut.Vcos=2*(1/Uscale)*squeeze(nanmean(Vcos,1));
+    DataOut.Usin=2*(1/Uscale)*squeeze(nanmean(Usin,1));
+    DataOut.Vsin=2*(1/Uscale)*squeeze(nanmean(Vsin,1));
     DataOut.DUDXcos=2*squeeze(nanmean(DUDXcos,1));
     DataOut.DUDXsin=2*squeeze(nanmean(DUDXsin,1));