diff --git a/demo_phi_00.gif b/demo_phi_00.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9e5c1b9ae69f0692d33dcffa5b575a879f514bbc
Binary files /dev/null and b/demo_phi_00.gif differ
diff --git a/phi_demo.gif b/phi_demo.gif
deleted file mode 100644
index e9010d6d0e27ceab12410e913183fa9052cd88e1..0000000000000000000000000000000000000000
Binary files a/phi_demo.gif and /dev/null differ
diff --git a/wk/analysis_2D.m b/wk/analysis_2D.m
index 2a379edaa5e779ab0c3c0ee85009bd4c77769b28..5c3fd115d7e0b35d87e8f2885397c52dce34934e 100644
--- a/wk/analysis_2D.m
+++ b/wk/analysis_2D.m
@@ -30,12 +30,12 @@ z = dz*(-Nz/2:(Nz/2-1)); Lz = max(z)-min(z);
disp('Analysis :')
disp('- iFFT')
% IFFT (Lower case = real space, upper case = frequency space)
-ne00 = zeros(Nr,Nz);
-ni00 = zeros(Nr,Nz);
-si00 = zeros(Nr,Nz);
-phi = zeros(Nr,Nz);
-drphi = zeros(Nr,Nz);
-dzphi = zeros(Nr,Nz);
+ne00 = zeros(Nr,Nz,Ns2D);
+ni00 = zeros(Nr,Nz,Ns2D);
+si00 = zeros(Nr,Nz,Ns5D);
+phi = zeros(Nr,Nz,Ns2D);
+drphi = zeros(Nr,Nz,Ns2D);
+dzphi = zeros(Nr,Nz,Ns2D);
for it = 1:numel(Ts2D)
NE_ = Ne00(:,:,it); NI_ = Ni00(:,:,it); PH_ = PHI(:,:,it);
@@ -46,6 +46,11 @@ for it = 1:numel(Ts2D)
dzphi(:,:,it) = real(fftshift(ifft2(1i*KZ.*(PH_),Nr,Nz)));
end
+if strcmp(OUTPUTS.write_non_lin,'.true.')
+for it = 1:numel(Ts5D)
+ si00(:,:,it) = real(fftshift(ifft2(squeeze(Si00(:,:,it)),Nr,Nz)));
+end
+end
% Post processing
disp('- post processing')
E_pot = zeros(1,Ns2D); % Potential energy n^2
@@ -160,7 +165,7 @@ save_figure
t0 = 0;
skip_ = 1;
DELAY = 0.01*skip_;
-FRAMES = floor(t0/dt2D)+1:skip_:numel(Ts2D);
+FRAMES = floor(t0/(Ts2D(2)-Ts2D(1)))+1:skip_:numel(Ts2D);
if 0
%% GIFS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Density ion
@@ -288,21 +293,21 @@ end
%%
if 0
%% Show frame in real space
-tf = 20; [~,it] = min(abs(Ts5D-tf));
+tf = 100; [~,it] = min(abs(Ts2D-tf)); [~,it5D] = min(abs(Ts5D-tf));
fig = figure; FIGNAME = ['rz_frame',sprintf('_%.2d',JOBNUM)];
subplot(221); plt = @(x) (((x)));
pclr = pcolor((RR),(ZZ),plt(ne00(:,:,it))); set(pclr, 'edgecolor','none'); colorbar;
- xlabel('$r$'); ylabel('$z$'); title(sprintf('t=%.3d',Ts5D(it))); legend('$|\hat n_e^{00}|$');
+ xlabel('$r$'); ylabel('$z$'); title(sprintf('t=%.3d',Ts2D(it))); legend('$|\hat n_e^{00}|$');
subplot(222); plt = @(x) ((x));
pclr = pcolor((RR),(ZZ),plt(ni00(:,:,it))); set(pclr, 'edgecolor','none'); colorbar;
- xlabel('$r$'); ylabel('$z$'); title(sprintf('t=%.3d',Ts5D(it))); legend('$|\hat n_i^{00}|$');
+ xlabel('$r$'); ylabel('$z$'); title(sprintf('t=%.3d',Ts2D(it))); legend('$|\hat n_i^{00}|$');
subplot(223); plt = @(x) ((x));
pclr = pcolor((RR),(ZZ),plt(phi(:,:,it))); set(pclr, 'edgecolor','none'); colorbar;
- xlabel('$r$'); ylabel('$z$'); title(sprintf('t=%.3d',Ts5D(it))); legend('$|\hat\phi|$');
+ xlabel('$r$'); ylabel('$z$'); title(sprintf('t=%.3d',Ts2D(it))); legend('$|\hat\phi|$');
if strcmp(OUTPUTS.write_non_lin,'.true.')
subplot(224); plt = @(x) fftshift((abs(x)),2);
- pclr = pcolor((RR),(ZZ),plt(si00(:,:,it))); set(pclr, 'edgecolor','none'); colorbar;
- xlabel('$r$'); ylabel('$z$'); title(sprintf('t=%.3d',Ts5D(it))); legend('$|S_i^{00}|$');
+ pclr = pcolor((RR),(ZZ),plt(si00(:,:,it5D))); set(pclr, 'edgecolor','none'); colorbar;
+ xlabel('$r$'); ylabel('$z$'); title(sprintf('t=%.3d',Ts5D(it5D))); legend('$|S_i^{00}|$');
end
save_figure
end
diff --git a/wk/fort.90 b/wk/fort.90
index 4f85c88f25b72d5cfc410c5a12d3e834f0b27316..ca350602e55ad5e263f13c57c0e0dd59d604a42b 100644
--- a/wk/fort.90
+++ b/wk/fort.90
@@ -9,9 +9,9 @@
jmaxe = 1
pmaxi = 2
jmaxi = 1
- Nr = 100
+ Nr = 256
Lr = 40
- Nz = 100
+ Nz = 256
Lz = 40
kpar = 0
/
@@ -25,17 +25,17 @@
write_phi = .true.
write_non_lin = .true.
write_doubleprecision = .true.
- resfile0 = 'ZP_forced_sym_100x50_L_40_Pe_2_Je_1_Pi_2_Ji_1_nB_0.5_nN_1_nu_1e-02_DG_mu_5e-04_'
- rstfile0 = '../checkpoint/cp_ZP_forced_sym_100x50_L_40_Pe_2_Je_1_Pi_2_Ji_1_nB_0.5_nN_1_nu_1e-02_DG_mu_5e-04_'
+ resfile0 = 'ZP_forced_sym_256x128_L_40_Pe_2_Je_1_Pi_2_Ji_1_nB_0.5_nN_1_nu_1e-03__mu_1e-04_'
+ rstfile0 = '../checkpoint/cp_ZP_forced_sym_256x128_L_40_Pe_2_Je_1_Pi_2_Ji_1_nB_0.5_nN_1_nu_1e-03__mu_1e-04_'
job2load = 0
/
&MODEL_PAR
! Collisionality
- CO = -2
+ CO = 0
DK = .false.
NON_LIN = .true.
- mu = 0.0005
- nu = 0.01
+ mu = 0.0001
+ nu = 0.001
tau_e = 1
tau_i = 1
sigma_e = 0.023338
diff --git a/wk/parameters_ZP.m b/wk/parameters_ZP.m
index ce21e71e7ec3d2b3023cd36d731bfab6fec8d746..45a749ac902839587036540cfc2ab5235e083977 100644
--- a/wk/parameters_ZP.m
+++ b/wk/parameters_ZP.m
@@ -5,16 +5,16 @@ default_plots_options
%% Set Up parameters
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% PHYSICAL PARAMETERS
-NU = 1e-2; % Collision frequency
+NU = 1e-3; % Collision frequency
TAU = 1.0; % e/i temperature ratio
ETAB = 0.5; % Magnetic gradient
ETAN = 1.0; % Density gradient
ETAT = 0.0; % Temperature gradient
-MU = 5e-4; % Hyper diffusivity coefficient
+MU = 1e-4; % Hyper diffusivity coefficient
LAMBDAD = 0.0;
NOISE0 = 5.0e-5;
%% GRID PARAMETERS
-N = 100; % Frequency gridpoints (Nkr = N/2)
+N = 256; % Frequency gridpoints (Nkr = N/2)
L = 40; % Size of the squared frequency domain
KREQ0 = 0; % put kr = 0
PMAXE = 02; % Highest electron Hermite polynomial degree
@@ -32,7 +32,7 @@ JOB2LOAD= 00;
%% OPTIONS
SIMID = 'ZP_forced_sym'; % Name of the simulation
NON_LIN = 1 *(1-KREQ0); % activate non-linearity (is cancelled if KREQ0 = 1)
-CO = -2; % Collision operator (0 : L.Bernstein, -1 : Full Coulomb, -2 : Dougherty)
+CO = 0; % Collision operator (0 : L.Bernstein, -1 : Full Coulomb, -2 : Dougherty)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% unused