diff --git a/matlab/compile_results.m b/matlab/compile_results.m
index 31fa70620db52aacb341a168fe4e514621820c78..c7f34640a56cc026a9952f777ab4e3f67a3531dd 100644
--- a/matlab/compile_results.m
+++ b/matlab/compile_results.m
@@ -61,19 +61,19 @@ while(CONTINUE)
disp(sprintf('Loading ID %.2d (%s)',JOBNUM,filename));
% Loading from output file
CPUTIME = h5readatt(filename,'/data/input','cpu_time');
- DT_SIM = h5readatt(filename,'/data/input','dt');
+ DT_SIM = h5readatt(filename,'/data/input/basic','dt');
[Pe, Je, Pi, Ji, kx, ky, z] = load_grid_data(filename);
- W_GAMMA = strcmp(h5readatt(filename,'/data/input','write_gamma'),'y');
- W_HF = strcmp(h5readatt(filename,'/data/input','write_hf' ),'y');
- W_PHI = strcmp(h5readatt(filename,'/data/input','write_phi' ),'y');
- W_NA00 = strcmp(h5readatt(filename,'/data/input','write_Na00' ),'y');
- W_NAPJ = strcmp(h5readatt(filename,'/data/input','write_Napj' ),'y');
- W_SAPJ = strcmp(h5readatt(filename,'/data/input','write_Sapj' ),'y');
- W_DENS = strcmp(h5readatt(filename,'/data/input','write_dens' ),'y');
- W_TEMP = strcmp(h5readatt(filename,'/data/input','write_temp' ),'y');
- KIN_E = strcmp(h5readatt(filename,'/data/input', 'KIN_E' ),'y');
+ W_GAMMA = strcmp(h5readatt(filename,'/data/input/diag_par','write_gamma'),'y');
+ W_HF = strcmp(h5readatt(filename,'/data/input/diag_par','write_hf' ),'y');
+ W_PHI = strcmp(h5readatt(filename,'/data/input/diag_par','write_phi' ),'y');
+ W_NA00 = strcmp(h5readatt(filename,'/data/input/diag_par','write_Na00' ),'y');
+ W_NAPJ = strcmp(h5readatt(filename,'/data/input/diag_par','write_Napj' ),'y');
+ W_SAPJ = strcmp(h5readatt(filename,'/data/input/diag_par','write_Sapj' ),'y');
+ W_DENS = strcmp(h5readatt(filename,'/data/input/diag_par','write_dens' ),'y');
+ W_TEMP = strcmp(h5readatt(filename,'/data/input/diag_par','write_temp' ),'y');
+ KIN_E = strcmp(h5readatt(filename,'/data/input/model', 'ADIAB_E' ),'n');
try
- BETA = h5readatt(filename,'/data/input','beta');
+ BETA = h5readatt(filename,'/data/input/model','beta');
catch
BETA = 0;
end
@@ -126,8 +126,8 @@ while(CONTINUE)
if W_GAMMA
- [ GGAMMA_RI, Ts0D, ~] = load_0D_data(filename, 'gflux_ri');
- PGAMMA_RI = load_0D_data(filename, 'pflux_ri');
+ [ GGAMMA_RI, Ts0D, ~] = load_0D_data(filename, 'gflux_xi');
+ PGAMMA_RI = load_0D_data(filename, 'pflux_xi');
GGAMMAI_ = cat(1,GGAMMAI_,GGAMMA_RI); clear GGAMMA_RI
PGAMMAI_ = cat(1,PGAMMAI_,PGAMMA_RI); clear PGAMMA_RI
end
@@ -210,13 +210,12 @@ while(CONTINUE)
Ts5D = [];
if W_NAPJ
- [Nipj, Ts5D, ~] = load_5D_data(filename, 'moments_i');
+ [Napj, Ts5D, ~] = load_5D_data(filename, 'moments');
tic
- Nipj_ = cat(6,Nipj_,Nipj); clear Nipj
+ Nipj_ = cat(6,Nipj_,Napj(1,:,:,:,:,:,:)); clear Nipj
toc
if KIN_E
- Nepj = load_5D_data(filename, 'moments_e');
- Nepj_ = cat(6,Nepj_,Nepj); clear Nepj
+ Nepj_ = cat(6,Nepj_,Napj(2,:,:,:,:,:,:)); clear Nepj
end
end
if W_SAPJ
@@ -298,7 +297,7 @@ else
end
if W_NA00
DATA.Ni00 = zeros(Nky,Nkx,Nz,numel(Ts3D_)); DATA.Ni00(:,:,1:Nz,:) = Ni00_;
- DATA.Nipjz = zeros(Nky,Nkx,Nz,numel(Ts3D_)); DATA.Nipjz(:,:,1:Nz,:) = Nipjz_;
+ DATA.Nipjz = zeros(Pe_new,Je_new,Nz,numel(Ts3D_)); DATA.Nipjz(:,:,1:Nz,:) = Nipjz_;
end
if W_DENS
DATA.DENS_I = zeros(Nky,Nkx,Nz,numel(Ts3D_)); DATA.DENS_I(:,:,1:Nz,:) = DENS_I_;
@@ -312,7 +311,7 @@ else
end
if W_NA00
DATA.Ne00 = zeros(Nky,Nkx,Nz,numel(Ts3D_)); DATA.Ne00(:,:,1:Nz,:) = Ne00_;
- DATA.Nepjz = zeros(Nky,Nkx,Nz,numel(Ts3D_)); DATA.Nepjz(:,:,1:Nz,:) = Nepjz_;
+ DATA.Nepjz = zeros(Pe_new,Je_new,Nz,numel(Ts3D_)); DATA.Nepjz(:,:,1:Nz,:) = Nepjz_;
end
if W_DENS
DATA.DENS_E = zeros(Nky,Nkx,Nz,numel(Ts3D_)); DATA.DENS_E(:,:,1:Nz,:) = DENS_E_;
@@ -341,8 +340,8 @@ else
DATA.param_title=['$\nu_{',DATA.CONAME,'}=$', num2str(DATA.NU), ...
', $\kappa_{Ni}=$',num2str(DATA.K_N),', $\kappa_{Ti}=$',num2str(DATA.K_T),...
', $L=',num2str(DATA.L),'$, $N=',...
- num2str(DATA.Nx),'$, $(P,J)=(',num2str(DATA.PMAXI),',',...
- num2str(DATA.JMAXI),')$,',' $\mu_{hd}=$(',num2str(DATA.MUx),...
+ num2str(DATA.Nx),'$, $(P,J)=(',num2str(DATA.PMAX),',',...
+ num2str(DATA.JMAX),')$,',' $\mu_{hd}=$(',num2str(DATA.MUx),...
',',num2str(DATA.MUy),')'];
DATA.paramshort = [num2str(DATA.Pmaxi),'x',num2str(DATA.Jmaxi),'x',...
num2str(DATA.Nkx),'x',num2str(DATA.Nky),'x',num2str(DATA.Nz)];
diff --git a/matlab/load/load_0D_data.m b/matlab/load/load_0D_data.m
index 7c2182f1281be5310dd2245144305eb005bbb50b..ee55c6fa0f56ae6657c31f525b57b649ffa720c2 100644
--- a/matlab/load/load_0D_data.m
+++ b/matlab/load/load_0D_data.m
@@ -1,8 +1,8 @@
function [ data, time, dt ] = load_0D_data( filename, variablename )
%LOAD_0D_DATA load a 0D variable stored in a hdf5 result file from HeLaZ
time = h5read(filename,'/data/var0d/time');
- dt = h5readatt(filename,'/data/input','dt');
- cstart= h5readatt(filename,'/data/input','start_iframe0d');
+ dt = h5readatt(filename,'/data/input/basic','dt');
+ cstart= h5readatt(filename,'/data/input/basic','start_iframe0d');
data = h5read(filename,['/data/var0d/',variablename]);
end
diff --git a/matlab/load/load_3D_data.m b/matlab/load/load_3D_data.m
index 451428f444e97e9a21f94fbe40ddca677fa6a080..47bc4bf072c22380f08784035a8fa75ac9e84d88 100644
--- a/matlab/load/load_3D_data.m
+++ b/matlab/load/load_3D_data.m
@@ -1,8 +1,8 @@
function [ data, time, dt ] = load_3D_data( filename, variablename )
%LOAD_3D_DATA load a 3D variable stored in a hdf5 result file from HeLaZ
time = h5read(filename,'/data/var3d/time');
- dt = h5readatt(filename,'/data/input','dt');
- cstart= h5readatt(filename,'/data/input','start_iframe3d');
+ dt = h5readatt(filename,'/data/input/basic','dt');
+ cstart= h5readatt(filename,'/data/input/basic','start_iframe3d');
% Find array size by loading the first output
tmp = h5read(filename,['/data/var3d/',variablename,'/', num2str(cstart+1,'%06d')]);
diff --git a/matlab/load/load_5D_data.m b/matlab/load/load_5D_data.m
index bc96f113bba9decc602b02db6c46ed0cafbcac34..6642a3bebc689f4775aad61ec70fa7eaf9d190a8 100644
--- a/matlab/load/load_5D_data.m
+++ b/matlab/load/load_5D_data.m
@@ -1,24 +1,20 @@
function [ data, time, dt ] = load_5D_data( filename, variablename )
%LOAD_5D_DATA load a 5D variable stored in a hdf5 result file from HeLaZ
time = h5read(filename,'/data/var5d/time');
- if strcmp(variablename,'moments_e') || strcmp(variablename,'Sepj')
- p = h5read(filename,'/data/grid/coordp_e');
- j = h5read(filename,'/data/grid/coordj_e');
- else
- p = h5read(filename,'/data/grid/coordp_i');
- j = h5read(filename,'/data/grid/coordj_i');
- end
+ na = h5readatt(filename,'/data/input/model','Na');
+ p = h5read(filename,'/data/grid/coordp');
+ j = h5read(filename,'/data/grid/coordj');
kx = h5read(filename,'/data/grid/coordkx');
ky = h5read(filename,'/data/grid/coordky');
z = h5read(filename,'/data/grid/coordz');
- dt = h5readatt(filename,'/data/input','dt');
- cstart= h5readatt(filename,'/data/input','start_iframe5d');
+ dt = h5readatt(filename,'/data/input/basic','dt');
+ cstart= h5readatt(filename,'/data/input/basic','start_iframe5d');
- data = zeros(numel(p),numel(j),numel(ky),numel(kx),numel(z),numel(time));
+ data = zeros(na,numel(p),numel(j),numel(ky),numel(kx),numel(z),numel(time));
for it = 1:numel(time)
tmp = h5read(filename,['/data/var5d/', variablename,'/', num2str(cstart+it,'%06d')]);
- data(:,:,:,:,:,it) = tmp.real + 1i * tmp.imaginary;
+ data(:,:,:,:,:,:,it) = tmp.real + 1i * tmp.imaginary;
end
end
\ No newline at end of file
diff --git a/matlab/load/load_grid_data.m b/matlab/load/load_grid_data.m
index 940381ec8f880067cb09d19edc1657405fa1a3a1..2a1dd8c9ae2e8c5699704f492792ae68cdbb8ec5 100644
--- a/matlab/load/load_grid_data.m
+++ b/matlab/load/load_grid_data.m
@@ -1,9 +1,9 @@
function [ pe, je, pi, ji, kx, ky, z ] = load_grid_data( filename )
%LOAD_GRID_DATA stored in a hdf5 result file from HeLaZ
- pe = h5read(filename,'/data/grid/coordp_e');
- je = h5read(filename,'/data/grid/coordj_e');
- pi = h5read(filename,'/data/grid/coordp_i');
- ji = h5read(filename,'/data/grid/coordj_i');
+ pe = h5read(filename,'/data/grid/coordp');
+ je = h5read(filename,'/data/grid/coordj');
+ pi = h5read(filename,'/data/grid/coordp');
+ ji = h5read(filename,'/data/grid/coordj');
kx = h5read(filename,'/data/grid/coordkx');
ky = h5read(filename,'/data/grid/coordky');
z = h5read(filename,'/data/grid/coordz');
diff --git a/matlab/load/load_params.m b/matlab/load/load_params.m
index 1f1b32a8e3444066b28b6ceda3f7cf4b3bfabbdc..8fb8f9735587f04deb4ee5343f61cd9af2a1aa6d 100644
--- a/matlab/load/load_params.m
+++ b/matlab/load/load_params.m
@@ -1,86 +1,69 @@
-DATA.CO = h5readatt(filename,'/data/input','CO');
-try
- DATA.ETA_N = h5readatt(filename,'/data/input','ETA_N');
- DATA.ETA_T = h5readatt(filename,'/data/input','ETA_T');
-catch
- DATA.ETA_N = 1.0;
- DATA.ETA_T = 1.0;
-end
-try
- DATA.K_N = h5readatt(filename,'/data/input','K_n');
-catch
- try
- DATA.K_N = h5readatt(filename,'/data/input','k_N');
- catch
- DATA.K_N = h5readatt(filename,'/data/input','k_Ni');
- end
-end
-try
- DATA.K_T = h5readatt(filename,'/data/input','K_T');
-catch
- try
- DATA.K_T = h5readatt(filename,'/data/input','k_T');
- catch
- DATA.K_T = h5readatt(filename,'/data/input','k_Ti');
- end
-end
-DATA.sigma_e = h5readatt(filename,'/data/input','sigma_e');
-DATA.sigma_i = h5readatt(filename,'/data/input','sigma_i');
-DATA.tau_e = h5readatt(filename,'/data/input','tau_e');
-DATA.tau_i = h5readatt(filename,'/data/input','tau_i');
-DATA.q_e = h5readatt(filename,'/data/input','q_e');
-DATA.q_i = h5readatt(filename,'/data/input','q_i');
-DATA.Q0 = h5readatt(filename,'/data/input','q0');
-DATA.SHEAR = h5readatt(filename,'/data/input','shear');
-DATA.EPS = h5readatt(filename,'/data/input','eps');
-DATA.PMAXI = h5readatt(filename,'/data/input','pmaxi');
-DATA.JMAXI = h5readatt(filename,'/data/input','jmaxi');
-DATA.PMAXE = h5readatt(filename,'/data/input','pmaxe');
-DATA.JMAXE = h5readatt(filename,'/data/input','jmaxe');
-% DATA.LINEARITY = h5readatt(filename,'/data/input','NON_LIN');
-% DATA.LINEARITY = h5readatt(filename,'/data/input','LINEARITY');
-DATA.NU = h5readatt(filename,'/data/input','nu');
-DATA.Nx = h5readatt(filename,'/data/input','Nx');
-DATA.Ny = h5readatt(filename,'/data/input','Ny');
-DATA.L = h5readatt(filename,'/data/input','Lx');
-DATA.CLOS = h5readatt(filename,'/data/input','CLOS');
-DATA.DT_SIM = h5readatt(filename,'/data/input','dt');
-DATA.MU = h5readatt(filename,'/data/input','mu');
-DATA.MUx = h5readatt(filename,'/data/input','mu_x');
-DATA.MUy = h5readatt(filename,'/data/input','mu_y');
-DATA.MUz = h5readatt(filename,'/data/input','mu_z');
-try
- DATA.BETA = h5readatt(filename,'/data/input','beta');
-catch
- DATA.BETA = 0;
-end
-DATA.W_GAMMA = h5readatt(filename,'/data/input','write_gamma') == 'y';
-DATA.W_PHI = h5readatt(filename,'/data/input','write_phi') == 'y';
-DATA.W_NA00 = h5readatt(filename,'/data/input','write_Na00') == 'y';
-DATA.W_NAPJ = h5readatt(filename,'/data/input','write_Napj') == 'y';
-DATA.W_SAPJ = h5readatt(filename,'/data/input','write_Sapj') == 'y';
+DATA.CO = h5readatt(filename,'/data/input/coll','CO');
+DATA.K_N = h5readatt(filename,'/data/input/ions','k_N');
+DATA.K_T = h5readatt(filename,'/data/input/ions','k_T');
+DATA.Q0 = h5readatt(filename,'/data/input/geometry','q0');
+DATA.EPS = h5readatt(filename,'/data/input/geometry','eps');
+DATA.SHEAR = h5readatt(filename,'/data/input/geometry','shear');
+DATA.GEOM = h5readatt(filename,'/data/input/geometry','geometry');
+% DATA.KAPPA = h5readatt(filename,'/data/input/geometry','kappa');
+% DATA.DELTA = h5readatt(filename,'/data/input/geometry','delta');
+
+DATA.DT_SIM = h5readatt(filename,'/data/input/basic','dt');
+DATA.PMAX = h5readatt(filename,'/data/input/grid','pmax');
+DATA.JMAX = h5readatt(filename,'/data/input/grid','jmax');
+DATA.Nx = h5readatt(filename,'/data/input/grid','Nx');
+DATA.Ny = h5readatt(filename,'/data/input/grid','Ny');
+DATA.L = h5readatt(filename,'/data/input/grid','Lx');
+DATA.CLOS = h5readatt(filename,'/data/input/model','CLOS');
+DATA.NL_CLOS = h5readatt(filename,'/data/input/model','NL_CLOS');
+DATA.Na = h5readatt(filename,'/data/input/model','Na');
+DATA.NU = h5readatt(filename,'/data/input/model','nu');
+DATA.MUp = h5readatt(filename,'/data/input/model','mu_p');
+DATA.MUj = h5readatt(filename,'/data/input/model','mu_j');
+DATA.MUx = h5readatt(filename,'/data/input/model','mu_x');
+DATA.MUy = h5readatt(filename,'/data/input/model','mu_y');
+DATA.MUz = h5readatt(filename,'/data/input/model','mu_z');
+DATA.LINEARITY = h5readatt(filename,'/data/input/model','LINEARITY');
+DATA.BETA = h5readatt(filename,'/data/input/model','beta');
+DATA.TAU_E = h5readatt(filename,'/data/input/model','tau_e');
+DATA.HYP_V = h5readatt(filename,'/data/input/model','HYP_V');
+DATA.K_cB = h5readatt(filename,'/data/input/model','k_cB');
+DATA.K_gB = h5readatt(filename,'/data/input/model','k_gB');
-% if DATA.LINEARITY == 'y'
-% DATA.LINEARITY = 1;
-% else
-% DATA.LINEARITY = 0;
-% end
+DATA.W_GAMMA = h5readatt(filename,'/data/input/diag_par','write_gamma') == 'y';
+DATA.W_PHI = h5readatt(filename,'/data/input/diag_par','write_phi') == 'y';
+DATA.W_NA00 = h5readatt(filename,'/data/input/diag_par','write_Na00') == 'y';
+DATA.W_NAPJ = h5readatt(filename,'/data/input/diag_par','write_Napj') == 'y';
+DATA.W_SAPJ = h5readatt(filename,'/data/input/diag_par','write_Sapj') == 'y';
+% Species dependent parameters
+DATA.sigma = zeros(1,DATA.Na);
+DATA.tau = zeros(1,DATA.Na);
+DATA.q = zeros(1,DATA.Na);
+DATA.K_N = zeros(1,DATA.Na);
+DATA.K_T = zeros(1,DATA.Na);
+spnames = {'ions','electrons'};
+for ia=1:DATA.Na
+ spdata = ['/data/input/',spnames{ia}];
+ DATA.sigma(ia) = h5readatt(filename,spdata,'sigma');
+ DATA.tau(ia) = h5readatt(filename,spdata,'tau');
+ DATA.q(ia) = h5readatt(filename,spdata,'q');
+ DATA.K_N(ia) = h5readatt(filename,spdata,'k_N');
+ DATA.K_T(ia) = h5readatt(filename,spdata,'k_T');
+end
+DATA.spnames = spnames{1:DATA.Na};
DATA.CONAME = DATA.CO;
if (DATA.CLOS == 0); DATA.CLOSNAME = 'Trunc.';
elseif(DATA.CLOS == 1); DATA.CLOSNAME = 'Clos. 1';
elseif(DATA.CLOS == 2); DATA.CLOSNAME = 'Clos. 2';
end
-if (DATA.PMAXE == DATA.PMAXI) && (DATA.JMAXE == DATA.JMAXI)
- degngrad = ['P_',num2str(DATA.PMAXE),'_J_',num2str(DATA.JMAXE)];
-else
- degngrad = ['Pe_',num2str(DATA.PMAXE),'_Je_',num2str(DATA.JMAXE),...
- '_Pi_',num2str(DATA.PMAXI),'_Ji_',num2str(DATA.JMAXI)];
-end
+
+degngrad = ['P_',num2str(DATA.PMAX),'_J_',num2str(DATA.JMAX)];
+
degngrad = [degngrad,'_Kni_%1.1f_nu_%0.0e_',...
DATA.CONAME,'_CLOS_',num2str(DATA.CLOS),'_mu_%0.0e'];
-degngrad = sprintf(degngrad,[DATA.K_N,DATA.NU,DATA.MU]);
+degngrad = sprintf(degngrad,[DATA.K_N,DATA.NU,DATA.MUx]);
% if ~DATA.LINEARITY; degngrad = ['lin_',degngrad]; end
resolution = [num2str(DATA.Nx),'x',num2str(DATA.Ny),'_'];
gridname = ['L_',num2str(DATA.L),'_'];
diff --git a/matlab/plot/plot_radial_transport_and_spacetime.m b/matlab/plot/plot_radial_transport_and_spacetime.m
index 098eae036c1b7109e6177d3a20b3aa8637c134ef..35c794914a7af795f2df5f97827d27e97872fb9e 100644
--- a/matlab/plot/plot_radial_transport_and_spacetime.m
+++ b/matlab/plot/plot_radial_transport_and_spacetime.m
@@ -38,26 +38,20 @@ function [FIGURE] = plot_radial_transport_and_spacetime(DATA, OPTIONS,CODE)
end
% Compute thermodynamic entropy Eq.(5) Navarro et al. 2012 PoP
% 1/2 sum_p sum_j Napj^2(k=0) (avg z)
- switch CODE
- case 'GYACOMO'
- Nipjz = sum(sum(sum(sum(conj(DATA.Nipj).*DATA.Nipj))));
- ff = trapz(DATA.z,Nipjz,5);
- E_TE = 0.5*squeeze(ff);
- % Compute electrostatic energy
- E_ES = zeros(size(DATA.Ts5D));
- bi = sqrt(KX.^2+KY.^2)*DATA.sigma_i*sqrt(2*DATA.tau_i); %argument of the kernel
- for it5D = 1:numel(DATA.Ts5D)
- [~,it3D] = min(abs(DATA.Ts3D-DATA.Ts5D(it5D)));
- for in = 1:DATA.Jmaxi
- Knphi = kernel(in-1,bi).*squeeze(trapz(DATA.z,DATA.PHI(:,:,:,it3D),3));
- Ni0n_z= squeeze(trapz(DATA.z,DATA.Nipj(1,in,:,:,:,it5D),5));
- E_ES(it5D) = 0.5*sum(sum(abs(conj(Knphi).*Ni0n_z)));
- end
+ Nipjz = sum(sum(sum(sum(conj(DATA.Nipj).*DATA.Nipj))));
+ ff = trapz(DATA.z,Nipjz,5);
+ E_TE = 0.5*squeeze(ff);
+ % Compute electrostatic energy
+ E_ES = zeros(size(DATA.Ts5D));
+ bi = sqrt(KX.^2+KY.^2)*DATA.sigma(1)*sqrt(2*DATA.tau(1)); %argument of the kernel
+ for it5D = 1:numel(DATA.Ts5D)
+ [~,it3D] = min(abs(DATA.Ts3D-DATA.Ts5D(it5D)));
+ for in = 1:DATA.Jmaxi
+ Knphi = kernel(in-1,bi).*squeeze(trapz(DATA.z,DATA.PHI(:,:,:,it3D),3));
+ Ni0n_z= squeeze(trapz(DATA.z,DATA.Nipj(1,in,:,:,:,it5D),5));
+ E_ES(it5D) = 0.5*sum(sum(abs(conj(Knphi).*Ni0n_z)));
end
- otherwise
- E_TE = 0; E_ES =0; DATA.Ts5D =[0 1];
end
-
%% Figure
clr_ = lines(20);
mvm = @(x) movmean(x,OPTIONS.NMVA);
diff --git a/matlab/profiler.m b/matlab/profiler.m
index 86d73e4da8f30169afd92c6ddec18669ce685b42..758f4958306f76f2c1b9aa08571cd7d41d5d9e95 100644
--- a/matlab/profiler.m
+++ b/matlab/profiler.m
@@ -3,7 +3,7 @@
% outfilename = ['/misc/HeLaZ_outputs',filename(3:end)];
outfilename = data.outfilenames{end};
CPUTIME = double(h5readatt(outfilename,'/data/input','cpu_time'));
-DT_SIM = h5readatt(outfilename,'/data/input','dt');
+DT_SIM = h5readatt(outfilename,'/data/input/basic','dt');
rhs_Tc = h5read(outfilename,'/profiler/Tc_rhs');
@@ -61,7 +61,12 @@ title(sprintf('Proc. 1, total sim. time ~%.0f [h]',CPUTIME/3600))
hold on
FIGNAME = 'profiler';
% save_figure
-
+% Re-order Legend
+lbl = fig.Children(1).String; % Retrieve legend labels
+numlbl = length(lbl); % Determine number of lables
+order = sort(1:1:numlbl,'descend'); % Create array of label numbers in descending order
+newlbl = lbl(order); % Create new labels in descending order
+legend(findobj(fig.Children(2),'Type','area'),newlbl) % Set the legend to follow the new labels
else
%% Normalized Area plot
fig = figure;
diff --git a/wk/analysis_gyacomo.m b/wk/analysis_gyacomo.m
index ce908eef861aa1dca78ee3bf3de40c788b984e2d..876f5affb385a1d933c11d63d62faf906a46fb11 100644
--- a/wk/analysis_gyacomo.m
+++ b/wk/analysis_gyacomo.m
@@ -1,6 +1,6 @@
%% UNCOMMENT FOR TUTORIAL
gyacomodir = pwd; gyacomodir = gyacomodir(1:end-2); % get code directory
-resdir = '../testcases/zpinch_example/'; %Name of the directory where the results are located
+resdir = '../testcases/zpinch_example_new/'; %Name of the directory where the results are located
PARTITION ='';
JOBNUMMIN = 00; JOBNUMMAX = 10;
%%
@@ -80,7 +80,7 @@ options.NAME = '\phi';
% options.NAME = 'Q_x';
% options.NAME = 'n_i';
% options.NAME = 'n_i-n_e';
-options.PLAN = 'xz';
+options.PLAN = 'xy';
% options.NAME = 'f_i';
% options.PLAN = 'sx';
options.COMP = 'avg';
@@ -100,20 +100,20 @@ options.INTERP = 0;
options.POLARPLOT = 0;
options.AXISEQUAL = 0;
options.NORMALIZE = 0;
-% options.NAME = '\phi';
+options.NAME = '\phi';
% options.NAME = '\psi';
% options.NAME = '\omega_z';
% options.NAME = 'T_i';
% options.NAME = 'n_i';
% options.NAME = '\phi^{NZ}';
-options.NAME = 'N_i^{00}';
+% options.NAME = 'N_i^{00}';
% options.NAME = 'N_i^{00}-N_e^{00}';
% options.NAME = 's_{Ex}';
% options.NAME = 'Q_x';
% options.NAME = 'k^2n_e';
-options.PLAN = 'xz';
+options.PLAN = 'xy';
options.COMP = 'avg';
-options.TIME = [500 1000 1500];
+options.TIME = [15 30 50];
options.RESOLUTION = 256;
data.a = data.EPS * 2e3;