From 076e4b173ede1c117f2ee5296825a78ceb74c981 Mon Sep 17 00:00:00 2001
From: Antoine Cyril David Hoffmann <ahoffman@spcpc606.epfl.ch>
Date: Tue, 10 May 2022 10:11:37 +0200
Subject: [PATCH] scripts update
---
matlab/compute/compute_fa_2D.m | 6 +++---
wk/analysis_3D.m | 15 +++++++++------
wk/gene_analysis_3D.m | 12 ++++++------
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/matlab/compute/compute_fa_2D.m b/matlab/compute/compute_fa_2D.m
index 50b3593f..c66ebba5 100644
--- a/matlab/compute/compute_fa_2D.m
+++ b/matlab/compute/compute_fa_2D.m
@@ -55,14 +55,14 @@ if options.non_adiab
for ikx = 1:data.Nkx
for iky = 1:data.Nky
kp_ = sqrt(kx_(ikx)^2 + ky_(iky)^2);
- Napj_(1,ij_,ikx,iky) = Napj_(1,ij_,ikx,iky) + kernel(ij_,kp_)*phi_(ikx,iky);
+ Napj_(1,ij_,iky,ikx) = Napj_(1,ij_,iky,ikx) + kernel(ij_,kp_)*phi_(iky,ikx);
end
end
end
end
if options.RMS
- FF = zeros(data.Nkx,data.Nky,numel(options.XPERP),numel(options.SPAR));
+ FF = zeros(data.Nky,data.Nkx,numel(options.XPERP),numel(options.SPAR));
FAM = FaM(SS,XX);
for ip_ = 1:Np
p_ = parray(ip_);
@@ -73,7 +73,7 @@ if options.RMS
HLF = HH.*LL.*FAM;
for ikx = 1:data.Nkx
for iky = 1:data.Nky
- FF(ikx,iky,:,:) = squeeze(FF(ikx,iky,:,:)) + Napj_(ip_,ij_,ikx,iky)*HLF;
+ FF(iky,ikx,:,:) = squeeze(FF(iky,ikx,:,:)) + Napj_(ip_,ij_,iky,ikx)*HLF;
end
end
end
diff --git a/wk/analysis_3D.m b/wk/analysis_3D.m
index 0f2cdef4..34dbcadc 100644
--- a/wk/analysis_3D.m
+++ b/wk/analysis_3D.m
@@ -95,14 +95,17 @@ end
if 0
%% Kinetic distribution function sqrt(<f_a^2>xy) (GENE vsp)
-options.SPAR = linspace(-3,3,64)+(6/127/2);
-options.XPERP = linspace( 0,6,64);
-% options.SPAR = vp';
-% options.XPERP = mu';
-options.Z = 1;
+% options.SPAR = linspace(-3,3,64)+(6/127/2);
+% options.XPERP = linspace( 0,6,64);
+options.SPAR = gene_data.vp';
+options.XPERP = gene_data.mu';
+options.Z = 'avg';
options.T = 200;
-options.CTR = 1;
+options.PLT_FCT = 'pcolor';
options.ONED = 0;
+options.non_adiab = 1;
+options.SPECIE = 'i';
+options.RMS = 1; % Root mean square i.e. sqrt(sum_k|f_k|^2) as in Gene
fig = plot_fa(data,options);
save_figure(data,fig)
end
diff --git a/wk/gene_analysis_3D.m b/wk/gene_analysis_3D.m
index ed4d3565..7479f55e 100644
--- a/wk/gene_analysis_3D.m
+++ b/wk/gene_analysis_3D.m
@@ -1,6 +1,6 @@
% folder = '/misc/gene_results/shearless_cyclone/miller_output_1.0/';
% folder = '/misc/gene_results/shearless_cyclone/miller_output_0.8/';
-folder = '/misc/gene_results/shearless_cyclone/s_alpha_output_1.2/';
+folder = '/misc/gene_results/shearless_cyclone/s_alpha_output_1.0/';
% folder = '/misc/gene_results/shearless_cyclone/s_alpha_output_0.5/';
% folder = '/misc/gene_results/shearless_cyclone/LD_s_alpha_output_1.0/';
% folder = '/misc/gene_results/shearless_cyclone/LD_s_alpha_output_0.8/';
@@ -93,11 +93,11 @@ gene_data = rotate_c_plane_nxnky_to_nkxny(gene_data);
if 1
%% Space time diagramm (fig 11 Ivanov 2020)
TAVG_0 = 0.8*gene_data.Ts3D(end); TAVG_1 = gene_data.Ts3D(end); % Averaging times duration
-% chose your field to plot in spacetime diag (uzf,szf,Gx)
-field = 'phi';
-compz = 'avg';
-nmvm = 1;
-fig = plot_radial_transport_and_spacetime(gene_data,TAVG_0,TAVG_1,field,nmvm,compz);
+options.NMVA = 1; % Moving average for time traces
+% options.ST_FIELD = '\Gamma_x'; % chose your field to plot in spacetime diag (e.g \phi,v_x,G_x)
+options.ST_FIELD = '\phi'; % chose your field to plot in spacetime diag (e.g \phi,v_x,G_x)
+options.INTERP = 1;
+fig = plot_radial_transport_and_spacetime(gene_data,options);
% save_figure(data,fig)
end
--
GitLab