Changeset 1096 for trunk/src/series

Timestamp:

Apr 2, 2021, 3:57:01 PM (4 years ago)

Author:

sommeria

Message:

bugs fixed

Location:

trunk/src/series

Files:

• civ_series.m (modified) (1 diff)
• merge_proj.m (modified) (2 diffs)
• sliding_average.m (modified) (2 diffs)

trunk/src/series/civ_series.m

@@ -331 +331 @@
     end
     if CheckInputFile
-        OutputPath=fullfile(Param.OutputPath,Param.Experiment,Param.Device);
+        OutputPath=fullfile(Param.OutputPath,num2str(Param.Experiment),num2str(Param.Device));
         if iview_A==0 % no nc file has been entered
             ncfile=fullfile_uvmat(OutputPath,Param.InputTable{1,2},Param.InputTable{1,3},Param.InputTable{1,5},...

trunk/src/series/merge_proj.m

@@ -83 +83 @@
     if ~exist(FirstFileName,'file')
         msgbox_uvmat('WARNING',['the first input file ' FirstFileName ' does not exist'])
-    elseif isequal(size(Param.InputTable,1),1) && ~isfield(Param,'ProjObject')
-        msgbox_uvmat('WARNING','You may need a projection object of type plane for merge_proj')
     end
     return
@@ -252 +250 @@
     CheckOverwrite=Param.CheckOverwrite;
 end
-OutputPath=fullfile(Param.OutputPath,Param.Experiment,Param.Device);
+OutputPath=fullfile(Param.OutputPath,num2str(Param.Experiment),num2str(Param.Device));
 
 for index=1:NbField

trunk/src/series/sliding_average.m

@@ -185 +185 @@
 
 %% initialisation
-T=24.4; %main wave period
-t0=3; % time for motion start (torus at its maximum x)
+char_index=regexp(SubDir{1},'waves_L1_');
+switch(SubDir{1}(char_index+9))
+    case '1'
+        amplitude=2.5 %oscillation amplitude
+        T=24.46;
+        t0=3 ;% dt=0.5 s, torus at its max x at the beginning of motion, i0=7
+    case '2'
+        amplitude=5 %oscillation amplitude
+        T=24.47;
+        t0=8.5; % dt=1/3 s -> image index of starting motion = 26, % torus at its max x at the beginning of motion
+    case '3'
+        amplitude=10 %oscillation amplitude
+        T=24.45;
+        t0=6.5-T/2;% dt=0.25, torus at its minimum x at the beginning of motion
+    case '4'  
+        amplitude=15 %oscillation amplitude
+        T=24.48;
+        t0=3.4;     %dt=0.2 -> i0=18 image index of starting motion, % torus at its max x at the beginning of motion
+end
 NbPeriod=2; %number of periods for the sliding average
 omega=2*pi/T;
-amplitude=2.5; %oscillation amplitude
 Lscale=15;%diameter of the torus, length scale for normalisation
 Uscale=amplitude*omega;
@@ -214 +230 @@
 NpTime=round(NbPeriod*T/dt+1);
 
-OutputPath=fullfile(Param.OutputPath,Param.Experiment,Param.Device);
+OutputPath=fullfile(Param.OutputPath,num2str(Param.Experiment),num2str(Param.Device));
 RootFileOut=RootFile{1};
 NomTypeOut='_1';