diff --git a/matlab/evolve_tracers.m b/matlab/evolve_tracers.m
index a6a738ce2f1305a1f800235a7e400e5cea593ac2..1363616c9916aef89192fbca444ac0504ea2dfef 100644
--- a/matlab/evolve_tracers.m
+++ b/matlab/evolve_tracers.m
@@ -2,10 +2,10 @@
SHOW_FILM = 1;
field2plot ='phi';
INIT = 'lin'; % lin (for a line)/ round (for a small round)/ gauss for random
-U_TIME = 40; % >0 for frozen velocity at a given time, -1 for evolving field
+U_TIME = 15000; % >0 for frozen velocity at a given time, -1 for evolving field
Evolve_U = 1; % 0 for frozen velocity at a given time, 1 for evolving field
Tfin = 100;
-dt_ = 0.01;
+dt_ = 0.1;
Nstep = ceil(Tfin/dt_);
% Init tracers
Np = 20; %number of tracers
diff --git a/testcases/miller_example/fort_00.90 b/testcases/fort.90
similarity index 93%
rename from testcases/miller_example/fort_00.90
rename to testcases/fort.90
index 728a3456cca5d895f068ef8ad01cd766d2211cbd..abce02cfd7ef427b8a376899d1c28642821ae22c 100644
--- a/testcases/miller_example/fort_00.90
+++ b/testcases/fort.90
@@ -11,8 +11,8 @@
jmaxi = 1
Nx = 128
Lx = 100
- Ny = 64
- Ly = 120
+ Ny = 128
+ Ly = 240
Nz = 16
Npol = 1
SG = .false.
@@ -28,7 +28,7 @@
nsave_1d = -1
nsave_2d = Inf
nsave_3d = 100
- nsave_5d = 500
+ nsave_5d = 1000
write_doubleprecision = .false.
write_gamma = .true.
write_hf = .true.
@@ -46,10 +46,10 @@
NL_CLOS = -1
LINEARITY = 'nonlinear'
KIN_E = .false.
- mu_x = 0.1
- mu_y = 0.1
+ mu_x = 1.0
+ mu_y = 1.0
N_HD = 4
- mu_z = 0.2
+ mu_z = 1.0
mu_p = 0
mu_j = 0
nu = 0.2
diff --git a/testcases/miller_example/fort_01.90 b/testcases/miller_example/fort_01.90
deleted file mode 100644
index 9e3c980953138529452ba6e30520beca2526733a..0000000000000000000000000000000000000000
--- a/testcases/miller_example/fort_01.90
+++ /dev/null
@@ -1,86 +0,0 @@
-&BASIC
- nrun = 100000000
- dt = 0.01
- tmax = 100
- maxruntime = 356400
-/
-&GRID
- pmaxe = 2
- jmaxe = 1
- pmaxi = 2
- jmaxi = 1
- Nx = 128
- Lx = 100
- Ny = 64
- Ly = 120
- Nz = 16
- Npol = 1
- SG = .false.
-/
-&GEOMETRY
- geom = 'miller'
- q0 = 1.4
- shear = 0.0
- eps = 0.18
-/
-&OUTPUT_PAR
- nsave_0d = 50
- nsave_1d = -1
- nsave_2d = Inf
- nsave_3d = 100
- nsave_5d = 500
- write_doubleprecision = .false.
- write_gamma = .true.
- write_hf = .true.
- write_phi = .true.
- write_Na00 = .true.
- write_Napj = .true.
- write_Sapj = .false.
- write_dens = .true.
- write_temp = .true.
- job2load = 0
-/
-&MODEL_PAR
- ! Collisionality
- CLOS = 0
- NL_CLOS = -1
- LINEARITY = 'nonlinear'
- KIN_E = .false.
- mu_x = 0.1
- mu_y = 0.1
- N_HD = 4
- mu_z = 0.2
- mu_p = 0
- mu_j = 0
- nu = 0.2
- tau_e = 1
- tau_i = 1
- sigma_e = 0.023338
- sigma_i = 1
- q_e = -1
- q_i = 1
- K_Ni = 2.22
- K_Ti = 6.92
- K_Ne = 0
- K_Te = 0
- GradB = 1
- CurvB = 1
- lambdaD = 0
- beta = 0
-/
-&COLLISION_PAR
- collision_model = 'DG'
- gyrokin_CO = .false.
- interspecies = .true.
- mat_file = 'null'
-/
-&INITIAL_CON
- INIT_OPT = 'ppj'
- ACT_ON_MODES = 'none'
- init_background = 0
- init_noiselvl = 1e-3
- iseed = 42
-/
-&TIME_INTEGRATION_PAR
- numerical_scheme = 'RK4'
-/
diff --git a/testcases/miller_example/fort_02.90 b/testcases/miller_example/fort_02.90
deleted file mode 100644
index e0af42a236e5e13f91f8214401585e5c694ead96..0000000000000000000000000000000000000000
--- a/testcases/miller_example/fort_02.90
+++ /dev/null
@@ -1,86 +0,0 @@
-&BASIC
- nrun = 100000000
- dt = 0.0075
- tmax = 100
- maxruntime = 356400
-/
-&GRID
- pmaxe = 2
- jmaxe = 1
- pmaxi = 2
- jmaxi = 1
- Nx = 128
- Lx = 100
- Ny = 64
- Ly = 120
- Nz = 16
- Npol = 1
- SG = .false.
-/
-&GEOMETRY
- geom = 'miller'
- q0 = 1.4
- shear = 0.0
- eps = 0.18
-/
-&OUTPUT_PAR
- nsave_0d = 50
- nsave_1d = -1
- nsave_2d = Inf
- nsave_3d = 100
- nsave_5d = 500
- write_doubleprecision = .false.
- write_gamma = .true.
- write_hf = .true.
- write_phi = .true.
- write_Na00 = .true.
- write_Napj = .true.
- write_Sapj = .false.
- write_dens = .true.
- write_temp = .true.
- job2load = 1
-/
-&MODEL_PAR
- ! Collisionality
- CLOS = 0
- NL_CLOS = -1
- LINEARITY = 'nonlinear'
- KIN_E = .false.
- mu_x = 0.1
- mu_y = 0.1
- N_HD = 4
- mu_z = 1.0
- mu_p = 0
- mu_j = 0
- nu = 0.2
- tau_e = 1
- tau_i = 1
- sigma_e = 0.023338
- sigma_i = 1
- q_e = -1
- q_i = 1
- K_Ni = 2.22
- K_Ti = 6.92
- K_Ne = 0
- K_Te = 0
- GradB = 1
- CurvB = 1
- lambdaD = 0
- beta = 0
-/
-&COLLISION_PAR
- collision_model = 'DG'
- gyrokin_CO = .false.
- interspecies = .true.
- mat_file = 'null'
-/
-&INITIAL_CON
- INIT_OPT = 'ppj'
- ACT_ON_MODES = 'none'
- init_background = 0
- init_noiselvl = 1e-3
- iseed = 42
-/
-&TIME_INTEGRATION_PAR
- numerical_scheme = 'RK4'
-/
diff --git a/wk/analysis_gyacomo.m b/wk/analysis_gyacomo.m
index 54353a90290ad85aba6b988cf96158867ceefaed..d521f606b1347651fa70ee0a74f87382961ab564 100644
--- a/wk/analysis_gyacomo.m
+++ b/wk/analysis_gyacomo.m
@@ -28,7 +28,7 @@ FMT = '.fig';
if 1
%% Space time diagramm (fig 11 Ivanov 2020)
% data.scale = 1;%/(data.Nx*data.Ny)^2;
-i_ = 3;
+i_ = 1;
disp([num2str(data.TJOB_SE(i_)),' ',num2str(data.TJOB_SE(i_+1))])
disp([num2str(data.NU_EVOL(i_)),' ',num2str(data.NU_EVOL(i_+1))])
options.TAVG_0 = data.TJOB_SE(i_);%0.4*data.Ts3D(end);
@@ -59,14 +59,14 @@ if 0
% Options
options.INTERP = 1;
options.POLARPLOT = 0;
-% options.NAME = '\phi';
-options.NAME = '\omega_z';
+options.NAME = '\phi';
+% options.NAME = '\omega_z';
% options.NAME = 'N_i^{00}';
% options.NAME = 'v_y';
% options.NAME = 'n_i^{NZ}';
% options.NAME = '\Gamma_x';
% options.NAME = 'n_i';
-options.PLAN = 'kxky';
+options.PLAN = 'xy';
% options.NAME = 'f_i';
% options.PLAN = 'sx';
options.COMP = 'avg';
diff --git a/wk/header_2DZP_results.m b/wk/header_2DZP_results.m
index 10428ea07e7024ecdb5db38b599148ea2aa8075e..544f4799cf42867510c3dad5a692dd71b9823f9c 100644
--- a/wk/header_2DZP_results.m
+++ b/wk/header_2DZP_results.m
@@ -194,10 +194,12 @@ resdir ='';
% resdir ='Zpinch_rerun/nu_0.1_FCGK_200x48x5x3_kN_scan';
% resdir ='Zpinch_rerun/nu_0.1_SGGK_200x48x5x3_kN_scan';
% resdir = 'Zpinch_rerun/kN_1.7_FCGK_200x32x5x3_nu_scan';
-% resdir = 'Zpinch_rerun/kN_1.7_SGGK_200x32x7x4_nu_scan';
-% resdir = 'Zpinch_rerun/kN_1.7_SGGK_200x32x5x3_nu_scan';
-resdir = 'Zpinch_rerun/kN_1.7_SGGK_256x64x5x3_nu_scan';
-%%
+% % resdir = 'Zpinch_rerun/kN_1.7_SGGK_200x32x7x4_nu_scan';
+resdir = 'Zpinch_rerun/kN_2.2_SGGK_200x32x5x3_nu_scan';
+% resdir = 'Zpinch_rerun/kN_1.7_SGGK_256x64x5x3_nu_scan';
+%% Convergence cases kN = (1.6 2.2) nu = (0.01 1.0)
+resdir = 'Zpinch_rerun/convcoll_Kn_1.6_200x32x3x2_mu_0.01';
+
JOBNUMMIN = 00; JOBNUMMAX = 10;
resdir = ['results/',resdir];
run analysis_gyacomo
\ No newline at end of file
diff --git a/wk/header_3D_results.m b/wk/header_3D_results.m
index 779dd117d108207ee1f9ecbc0734d87c95530fd3..63cb0bf33d953ee2f8636517e5faaf903fc35339 100644
--- a/wk/header_3D_results.m
+++ b/wk/header_3D_results.m
@@ -59,6 +59,8 @@ gyacomodir = '/home/ahoffman/gyacomo/';
% resdir = 'NL_KBM/192x64x24x5x3';
%% Linear CBC
% resdir = 'linear_CBC/20x2x32_21x11_Lx_62.8319_Ly_31.4159_q0_1.4_e_0.18_s_0.8_kN_2.22_kT_5.3_nu_1e-02_DGDK_adiabe';
-resdir = 'testcases/miller_example';
+% resdir = 'testcases/miller_example';
+resdir = 'Miller/128x256x3x2_CBC_dt_5e-3';
+% resdir = ['results/',resdir];
JOBNUMMIN = 00; JOBNUMMAX = 10;
run analysis_gyacomo
diff --git a/wk/lin_EPY.m b/wk/lin_EPY.m
index 8a00601769ea099816c445b63c0880560ad0257c..429c1326ac7e1033a481c0281fdbe7f9fa620cb3 100644
--- a/wk/lin_EPY.m
+++ b/wk/lin_EPY.m
@@ -16,10 +16,10 @@ CLUSTER.TIME = '99:00:00'; % allocation time hh:mm:ss
%% PHYSICAL PARAMETERS
NU = 0.1; % Collision frequency
TAU = 1.0; % e/i temperature ratio
-K_Ne = 2.0; % ele Density '''
-K_Te = 0.5; % ele Temperature '''
-K_Ni = 2.0; % ion Density gradient drive
-K_Ti = 0.5; % ion Temperature '''
+K_Ne = 2.2; % ele Density '''
+K_Te = K_Ne/4; % ele Temperature '''
+K_Ni = K_Ne; % ion Density gradient drive
+K_Ti = K_Ni/4; % ion Temperature '''
SIGMA_E = 0.0233380; % mass ratio sqrt(m_a/m_i) (correct = 0.0233380)
KIN_E = 1; % 1: kinetic electrons, 2: adiabatic electrons
BETA = 0.0; % electron plasma beta
@@ -33,7 +33,7 @@ JMAXI = J; % "
NX = 2; % real space x-gridpoints
NY = 100; % '' y-gridpoints
LX = 2*pi/0.8; % Size of the squared frequency domain
-LY = 2*pi/0.05; % Size of the squared frequency domain
+LY = 120;%2*pi/0.05; % Size of the squared frequency domain
NZ = 1; % number of perpendicular planes (parallel grid)
NPOL = 1;
SG = 0; % Staggered z grids option