diff --git a/matlab/compile_results.m b/matlab/compile_results.m
index 00abfff9eacb22f6cf8359fc16ce14848ac5e504..4a0324e22ab567a559b55ed4f82cf2b8a44d7e48 100644
--- a/matlab/compile_results.m
+++ b/matlab/compile_results.m
@@ -13,9 +13,12 @@ DATA.DT_EVOL = []; %
% FIELDS
Nipj_ = []; Nepj_ = [];
Ni00_ = []; Ne00_ = [];
-HFLUX_ = [];
-GGAMMA_ = [];
-PGAMMA_ = [];
+HFLUXI_ = [];
+HFLUXE_ = [];
+GGAMMAI_ = [];
+PGAMMAI_ = [];
+GGAMMAE_ = [];
+PGAMMAE_ = [];
PHI_ = [];
DENS_E_ = [];
DENS_I_ = [];
@@ -110,13 +113,17 @@ while(CONTINUE)
if W_GAMMA
[ GGAMMA_RI, Ts0D, ~] = load_0D_data(filename, 'gflux_ri');
PGAMMA_RI = load_0D_data(filename, 'pflux_ri');
- GGAMMA_ = cat(1,GGAMMA_,GGAMMA_RI); clear GGAMMA_RI
- PGAMMA_ = cat(1,PGAMMA_,PGAMMA_RI); clear PGAMMA_RI
+ GGAMMAI_ = cat(1,GGAMMAI_,GGAMMA_RI); clear GGAMMA_RI
+ PGAMMAI_ = cat(1,PGAMMAI_,PGAMMA_RI); clear PGAMMA_RI
end
if W_HF
- [ HFLUX_X, Ts0D, ~] = load_0D_data(filename, 'hflux_x');
- HFLUX_ = cat(1,HFLUX_,HFLUX_X); clear HFLUX_X
+ [ HFLUX_XI, Ts0D, ~] = load_0D_data(filename, 'hflux_xi');
+ HFLUXI_ = cat(1,HFLUXI_,HFLUX_XI); clear HFLUX_XI
+% if(KIN_E)
+% [ HFLUX_XE, Ts0D, ~] = load_0D_data(filename, 'hflux_xe');
+% HFLUXE_ = cat(1,HFLUXE_,HFLUX_XE); clear HFLUX_XE
+% end
end
if W_PHI
@@ -248,13 +255,15 @@ else
% scaling
DATA.scale = (1/Nx/Ny)^2;
% Fields
- DATA.GGAMMA_RI = GGAMMA_; DATA.PGAMMA_RI = PGAMMA_; DATA.HFLUX_X = HFLUX_;
+ DATA.GGAMMA_RI = GGAMMAI_; DATA.PGAMMA_RI = PGAMMAI_; DATA.HFLUX_X = HFLUXI_;
DATA.Nipj = Nipj_; DATA.Ni00 = Ni00_; DATA.DENS_I = DENS_I_; DATA.TEMP_I = TEMP_I_;
if(KIN_E)
DATA.Nepj = Nepj_; DATA.Ne00 = Ne00_; DATA.DENS_E = DENS_E_; DATA.TEMP_E = TEMP_E_;
+ DATA.HFLUX_XE = HFLUXE_;
end
DATA.Ts5D = Ts5D_; DATA.Ts3D = Ts3D_; DATA.Ts0D = Ts0D_;
DATA.PHI = PHI_;
+ DATA.KIN_E=KIN_E;
% grids
DATA.Pe = Pe; DATA.Pi = Pi;
DATA.Je = Je; DATA.Ji = Ji;
diff --git a/matlab/plot/plot_fluxes.m b/matlab/plot/plot_fluxes.m
index 02905b1195b01c1f13d8815d405fe0f456378d70..41a1d2831551d8527a2bdb073a3bbcdb08aad550 100644
--- a/matlab/plot/plot_fluxes.m
+++ b/matlab/plot/plot_fluxes.m
@@ -1,5 +1,9 @@
figure
subplot(211)
-plot(data.Ts0D,data.PGAMMA_RI');
+plot(data.Ts0D,data.PGAMMA_RI'*data.scale);
subplot(212)
-plot(data.Ts0D,-data.HFLUX_X);
\ No newline at end of file
+hold on
+if(data.KIN_E)
+plot(data.Ts0D,data.HFLUX_XE*data.scale);
+end
+plot(data.Ts0D,data.HFLUX_X*data.scale);
\ No newline at end of file
diff --git a/matlab/plot/show_geometry.m b/matlab/plot/show_geometry.m
index 47024ac422586cc5333aceda1f0753ad6ea8b5b8..5acdb7a05a9e68468698880b62b76e8f01667f84 100644
--- a/matlab/plot/show_geometry.m
+++ b/matlab/plot/show_geometry.m
@@ -1,8 +1,8 @@
function [ FIGURE ] = show_geometry(DATA,OPTIONS)
% filtering Z pinch and torus
if DATA.Nz > 1 % Torus flux tube geometry
- Nptor = DATA.Nz*2; Tgeom = 1;
- Nturns = 1;
+ Nturns = floor(abs(DATA.z(1)/pi));
+ Nptor = ceil(DATA.Nz*2/Nturns); Tgeom = 1;
a = DATA.EPS; % Torus minor radius
R = 1.; % Torus major radius
q = (DATA.Nz>1)*DATA.Q0; % Flux tube safety factor
diff --git a/wk/analysis_HeLaZ.m b/wk/analysis_HeLaZ.m
index 4df222ad254750d0bdf48b1e84596dfc8a0e4b2a..6e3e6ef0738f6a3af72d19164eb1d35fdae54456 100644
--- a/wk/analysis_HeLaZ.m
+++ b/wk/analysis_HeLaZ.m
@@ -11,7 +11,7 @@ system(['mkdir -p ',LOCALDIR]);
CMD = ['rsync ', LOCALDIR,'outputs* ',MISCDIR]; disp(CMD);
system(CMD);
% Load outputs from jobnummin up to jobnummax
-JOBNUMMIN = 00; JOBNUMMAX = 20;
+JOBNUMMIN = 00; JOBNUMMAX = 01;
data = compile_results(MISCDIR,JOBNUMMIN,JOBNUMMAX); %Compile the results from first output found to JOBNUMMAX if existing
data.localdir = LOCALDIR;
data.FIGDIR = LOCALDIR;
@@ -53,7 +53,7 @@ options.NAME = '\phi';
options.PLAN = 'xz';
% options.NAME = 'f_i';
% options.PLAN = 'sx';
-options.COMP = 'avg';
+options.COMP = 1;
% options.TIME = data.Ts5D(end-30:end);
options.TIME = data.Ts3D;
% options.TIME = [350:600];
@@ -75,10 +75,10 @@ options.NAME = '\phi';
% options.NAME = '\Gamma_x';
% options.NAME = 'k^2n_e';
options.PLAN = 'kxky';
-% options.NAME = 'f_i';
+% options.NAME 'f_i';
% options.PLAN = 'sx';
-options.COMP = 'avg';
-options.TIME = [100];
+options.COMP = 33;
+options.TIME = [40 80 100 200];
data.a = data.EPS * 2e3;
fig = photomaton(data,options);
% save_figure(data,fig)
@@ -88,9 +88,9 @@ if 0
%% 3D plot on the geometry
options.INTERP = 1;
options.NAME = 'n_i';
-options.PLANES = [1:1:16];
+options.PLANES = [1:10:80];
options.TIME = [200];
-options.PLT_MTOPO = 1;
+options.PLT_MTOPO = 0;
data.rho_o_R = 2e-3; % Sound larmor radius over Machine size ratio
fig = show_geometry(data,options);
save_figure(data,fig,'.png')
@@ -98,10 +98,10 @@ 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 = gene_data.vp';
-options.XPERP = gene_data.mu';
+options.SPAR = linspace(-3,3,32)+(6/127/2);
+options.XPERP = linspace( 0,6,32);
+% options.SPAR = gene_data.vp';
+% options.XPERP = gene_data.mu';
options.iz = 'avg';
options.T = [600];
options.PLT_FCT = 'contour';
diff --git a/wk/cbc_qx_results.m b/wk/cbc_qx_results.m
index 3fa9a986c39efbf0ff482337f0a4261505a3672b..2fd7e9b08c20d17a16f4073879a19ff25c1b7a6e 100644
--- a/wk/cbc_qx_results.m
+++ b/wk/cbc_qx_results.m
@@ -25,8 +25,8 @@ KN = 2.22;
KT = [1.00 0.90 0.80 0.70 0.60 0.50]*6.96;
gm42 = [32.2 18.8 10.5 5.89 1.74 0.00];
gm42_err = [05.2 03.8 2.10 1.66 0.53 0.00];
-gm84 = [0.00 13.2 7.66 3.20 0.00 0.00];
-gm84_err = [0.00 2.79 1.93 0.98 0.00 0.00];
+gm84 = [0.00 13.2 7.66 2.86 0.00 0.00];
+gm84_err = [0.00 2.79 1.93 0.55 0.00 0.00];
gne = [0.00 0.00 0.00 0.00 0.00 0.00];
gne_err = [0.00 0.00 0.00 0.00 0.00 0.00];
diff --git a/wk/header_3D_results.m b/wk/header_3D_results.m
index 965e457a3e324dc9527c4daf8f9c737b9fae5f71..07fbb41f5b172f1d7f10bd251bba48e2e182bb00 100644
--- a/wk/header_3D_results.m
+++ b/wk/header_3D_results.m
@@ -12,6 +12,8 @@ helazdir = '/home/ahoffman/HeLaZ/';
%% AVS
% outfile = 'volcokas/64x32x16x5x3_kin_e_npol_1';
% outfile = 'volcokas/64x32x16x5x3_kin_e_npol_1';
+% outfile = 'shearless_cyclone/64x32x80x5x3_CBC_Npol_5_kine';
+% outfile = 'shearless_cyclone/96x32x160x5x3_CBC_Npol_10_kine';
outfile = 'shearless_cyclone/64x32x160x5x3_CBC_Npol_10_kine';
%% CBC
% outfile ='shearless_cyclone/64x32x16x5x3_CBC_080';