diff --git a/testcases/ExB_shear_demo/GS2_method/fast_analysis.m b/testcases/ExB_shear_demo/GS2_method/fast_analysis.m
deleted file mode 100644
index 773ded3ee61011e4c30b06520bb7d4eb6750b1c8..0000000000000000000000000000000000000000
--- a/testcases/ExB_shear_demo/GS2_method/fast_analysis.m
+++ /dev/null
@@ -1,33 +0,0 @@
-gyacomodir = '../../../';
-addpath(genpath([gyacomodir,'matlab'])) % ... add
-addpath(genpath([gyacomodir,'matlab/plot'])) % ... add
-addpath(genpath([gyacomodir,'matlab/compute'])) % ... add
-addpath(genpath([gyacomodir,'matlab/load'])) % ... add
-default_plots_options
-
-J0 = 00; J1 = 00;
-
-% Load basic info (grids and time traces)
-DATADIR = [pwd,'/'];
-data = {};
-data = compile_results_low_mem(data,DATADIR,J0,J1);
-[data.Na00, data.Ts3D] = compile_results_3Da(DATADIR,J0,J1,'Na00');
-data.Ni00 = reshape(data.Na00(1,:,:,:,:),data.grids.Nky,data.grids.Nkx,data.grids.Nz,numel(data.Ts3D));
-
-% field snapshots
-options.INTERP = 0;
-options.POLARPLOT = 0;
-options.AXISEQUAL = 1;
-options.NORMALIZE = 0;
-options.LOGSCALE = 0;
-options.CLIMAUTO = 1;
-options.NAME = ['N_i^{00}'];
-options.PLAN = 'xy'; options.COMP =floor(data.grids.Nz/2)+1;
-options.TIME = [0 0.5 1.0];
-options.RESOLUTION = 256;
-options.BWR = 0; % bluewhitered plot or gray
-fig = photomaton(data,options);
-colormap(gray)
-clim('auto')
-data.FIGDIR = DATADIR;
-save_figure(data,fig,'.png');
diff --git a/testcases/ExB_shear_demo/GS2_method/fort_00.90 b/testcases/ExB_shear_demo/GS2_method/fort_00.90
deleted file mode 100644
index 268c4fe7853c82336b77224a03e2d0c8ac9ba0d6..0000000000000000000000000000000000000000
--- a/testcases/ExB_shear_demo/GS2_method/fort_00.90
+++ /dev/null
@@ -1,100 +0,0 @@
-&BASIC
- nrun = 100000000
- dt = 0.001
- tmax = 1.0
- maxruntime = 356400
- job2load = -1
-/
-&GRID
- pmax = 0
- jmax = 0
- Nx = 186
- Lx = 100
- Ny = 186
- Ly = 100
- Nz = 1
- SG = .false.
- Nexc = 1
-/
-&GEOMETRY
- geom = 'zpinch'!'miller'
- q0 = 1.0
- shear = 0.0
- eps = 0.0
- kappa = 1
- s_kappa = 0
- delta = 0
- s_delta = 0
- zeta = 0
- s_zeta = 0
- parallel_bc = 'dirichlet'
- shift_y = 0
- Npol = 1
- PB_PHASE= .false.
-/
-&DIAGNOSTICS
- dtsave_0d = 0.01
- dtsave_1d = -1
- dtsave_2d = -1
- dtsave_3d = 0.01
- dtsave_5d = 100
- write_doubleprecision = .true.
- write_gamma = .true.
- write_hf = .true.
- write_phi = .true.
- write_Na00 = .true.
- write_Napj = .true.
- write_dens = .true.
- write_temp = .true.
-/
-&MODEL
-LINEARITY = 'nonlinear'
-RM_LD_T_EQ= .false.
- Na = 1
- mu_x = 1
- mu_y = 1
- N_HD = 4
- mu_z = 0
- HYP_V = 'hypcoll'
- mu_p = 0
- mu_j = 0
- nu = 1
- k_gB = 0
- k_cB = 0
- lambdaD = 0
- beta = 0.0
- ExBrate = 0.0
- ikxZF = 2
- ZFamp = 0
- ADIAB_E = .true.
- ADIAB_I = .false.
- tau_i = 1
- MHD_PD = .false.
-/
-&CLOSURE
- hierarchy_closure='truncation'
- dmax =-1
- nonlinear_closure='truncation'
- nmax =0
-/
-&SPECIES
- name_ = 'ions'
- tau_ = 1
- sigma_ = 1
- q_ = 1
- K_N_ = 0
- K_T_ = 0
-/
-&COLLISION
- collision_model = 'DG'
- GK_CO = .false.
- INTERSPECIES = .true.
- mat_file = '/home/ahoffman/gyacomo/iCa/null'
- collision_kcut = 1
-/
-&INITIAL
- INIT_OPT = 'ricci'
-/
-&TIME_INTEGRATION
- numerical_scheme = 'RK4'
-/
diff --git a/testcases/ExB_shear_demo/background_Er/fast_analysis.m b/testcases/ExB_shear_demo/background_Er/fast_analysis.m
deleted file mode 100644
index ade8aed35bcc6dc3799f6d0d68c86d9fda59aae8..0000000000000000000000000000000000000000
--- a/testcases/ExB_shear_demo/background_Er/fast_analysis.m
+++ /dev/null
@@ -1,53 +0,0 @@
-gyacomodir = '../../../';
-addpath(genpath([gyacomodir,'matlab'])) % ... add
-addpath(genpath([gyacomodir,'matlab/plot'])) % ... add
-addpath(genpath([gyacomodir,'matlab/compute'])) % ... add
-addpath(genpath([gyacomodir,'matlab/load'])) % ... add
-default_plots_options
-
-J0 = 00; J1 = 00;
-
-% Load basic info (grids and time traces)
-DATADIR = [pwd,'/'];
-data = {};
-data = compile_results_low_mem(data,DATADIR,J0,J1);
-[data.Na00, data.Ts3D] = compile_results_3Da(DATADIR,J0,J1,'Na00');
-data.Ni00 = reshape(data.Na00(1,:,:,:,:),data.grids.Nky,data.grids.Nkx,data.grids.Nz,numel(data.Ts3D));
-
-% field snapshots
-options.INTERP = 0;
-options.POLARPLOT = 0;
-options.AXISEQUAL = 1;
-options.NORMALIZE = 0;
-options.LOGSCALE = 0;
-options.CLIMAUTO = 1;
-options.NAME = ['N_i^{00}'];
-options.PLAN = 'xy'; options.COMP =floor(data.grids.Nz/2)+1;
-options.TIME = [0 2.0 4.0];
-options.RESOLUTION = 256;
-options.BWR = 0; % bluewhitered plot or gray
-fig = photomaton(data,options);
-colormap(gray)
-clim('auto')
-data.FIGDIR = DATADIR;
-% save_figure(data,fig,'.png');
-
-
-if 0
-%% MOVIES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-options.INTERP = 1;
-options.POLARPLOT = 0;
-options.BWR = 0; % bluewhitered plot or gray
-options.CLIMAUTO = 1; % adjust the colormap auto
-options.NAME = ['N_i^{00}'];
-% options.NAME = ['N_i^{00}'];
-options.PLAN = ['xy'];
-options.COMP = 1;
-options.TIME = data.Ts3D(1:1:end);
-data.EPS = 0.1;
-data.a = data.EPS * 2000;
-options.RESOLUTION = 64;
-options.FPS = 12;
-options.RMAXIS = 1;
-create_film(data,options,'.gif')
-end
diff --git a/testcases/ExB_shear_demo/background_Er/fort.90 b/testcases/ExB_shear_demo/background_Er/fort.90
deleted file mode 100644
index c8d537d892db73bad846fabb349b3070e2f1b642..0000000000000000000000000000000000000000
--- a/testcases/ExB_shear_demo/background_Er/fort.90
+++ /dev/null
@@ -1,107 +0,0 @@
-&BASIC
- nrun = 100000000
- dt = 0.05
- tmax = 5.0
- maxruntime = 356400
- job2load = -1
-/
-&GRID
- pmax = 0
- jmax = 0
- Nx = 186
- Lx = 100
- Ny = 186
- Ly = 100
- Nz = 1
- SG = .false.
- Nexc = 1
-/
-&GEOMETRY
- geom = 'zpinch'!'miller'
- q0 = 1.0
- shear = 0.0
- eps = 0.0
- kappa = 1
- s_kappa = 0
- delta = 0
- s_delta = 0
- zeta = 0
- s_zeta = 0
- parallel_bc = 'dirichlet'
- shift_y = 0
- Npol = 1
- PB_PHASE= .false.
-/
-&DIAGNOSTICS
- dtsave_0d = 0.05
- dtsave_1d = -1
- dtsave_2d = -1
- dtsave_3d = 0.025
- dtsave_5d = -1
- write_doubleprecision = .true.
- write_gamma = .true.
- write_hf = .true.
- write_phi = .true.
- write_Na00 = .true.
- write_Napj = .true.
- write_dens = .true.
- write_temp = .true.
-/
-&MODEL
-LINEARITY = 'nonlinear'
-RM_LD_T_EQ= .false.
- Na = 1
- mu_x = 1
- mu_y = 1
- N_HD = 4
- mu_z = 0
- HYP_V = 'hypcoll'
- mu_p = 0
- mu_j = 0
- nu = 0
- k_gB = 0
- k_cB = 0
- lambdaD = 0
- beta = 0.0
- ExBrate = 0.0
- ikxZF = 1
- ZFrate =-0.5
- ZF_ONLY = .t.
- ADIAB_E = .true.
- ADIAB_I = .false.
- tau_i = 1
- MHD_PD = .false.
-/
-&CLOSURE
- hierarchy_closure='truncation'
- dmax =-1
- nonlinear_closure='truncation'
- nmax =0
-/
-&SPECIES
- name_ = 'ions'
- tau_ = 1
- sigma_ = 1
- q_ = 1
- K_N_ = 0
- K_T_ = 0
-/
-&COLLISION
- collision_model = 'DG'
- GK_CO = .false.
- INTERSPECIES = .true.
- mat_file = '/home/ahoffman/gyacomo/iCa/null'
- collision_kcut = 1
-/
-&INITIAL
- INIT_OPT = 'mom00_mode'
- Nmodes = 1
-/
-&MODE
- I_ = 0
- J_ = 1
- amp_ = 1000
-/
-&TIME_INTEGRATION
- numerical_scheme = 'RK4'
-/
diff --git a/testcases/ExB_shear_demo/background_Er/fort_00.90 b/testcases/ExB_shear_demo/background_Er/fort_00.90
deleted file mode 100644
index f935e5279cf07c35e8f929967d82301fda6db40d..0000000000000000000000000000000000000000
--- a/testcases/ExB_shear_demo/background_Er/fort_00.90
+++ /dev/null
@@ -1,101 +0,0 @@
-&BASIC
- nrun = 100000000
- dt = 0.05
- tmax = 10.0
- maxruntime = 356400
- job2load = -1
-/
-&GRID
- pmax = 0
- jmax = 0
- Nx = 186
- Lx = 100
- Ny = 186
- Ly = 100
- Nz = 1
- SG = .false.
- Nexc = 1
-/
-&GEOMETRY
- geom = 'zpinch'!'miller'
- q0 = 1.0
- shear = 0.0
- eps = 0.0
- kappa = 1
- s_kappa = 0
- delta = 0
- s_delta = 0
- zeta = 0
- s_zeta = 0
- parallel_bc = 'dirichlet'
- shift_y = 0
- Npol = 1
- PB_PHASE= .false.
-/
-&DIAGNOSTICS
- dtsave_0d = 0.05
- dtsave_1d = -1
- dtsave_2d = -1
- dtsave_3d = 0.025
- dtsave_5d = -1
- write_doubleprecision = .true.
- write_gamma = .true.
- write_hf = .true.
- write_phi = .true.
- write_Na00 = .true.
- write_Napj = .true.
- write_dens = .true.
- write_temp = .true.
-/
-&MODEL
-LINEARITY = 'nonlinear'
-RM_LD_T_EQ= .false.
- Na = 1
- mu_x = 1
- mu_y = 1
- N_HD = 4
- mu_z = 0
- HYP_V = 'hypcoll'
- mu_p = 0
- mu_j = 0
- nu = 0
- k_gB = 0
- k_cB = 0
- lambdaD = 0
- beta = 0.0
- ExBrate = 0
- ikxZF = 1
- ZFrate = 0.5
- ZF_ONLY = .t.
- ADIAB_E = .true.
- ADIAB_I = .false.
- tau_i = 1
- MHD_PD = .false.
-/
-&CLOSURE
- hierarchy_closure='truncation'
- dmax =-1
- nonlinear_closure='truncation'
- nmax =0
-/
-&SPECIES
- name_ = 'ions'
- tau_ = 1
- sigma_ = 1
- q_ = 1
- K_N_ = 0
- K_T_ = 0
-/
-&COLLISION
- collision_model = 'DG'
- GK_CO = .false.
- INTERSPECIES = .true.
- mat_file = '/home/ahoffman/gyacomo/iCa/null'
- collision_kcut = 1
-/
-&INITIAL
- INIT_OPT = 'ricci'
-/
-&TIME_INTEGRATION
- numerical_scheme = 'RK4'
-/
diff --git a/testcases/ITG_zpinch/3D/fort_00.90 b/testcases/ITG_zpinch/3D/fort_00.90
new file mode 100644
index 0000000000000000000000000000000000000000..d6255d0b0adb301845994752276cbcb0c4646089
--- /dev/null
+++ b/testcases/ITG_zpinch/3D/fort_00.90
@@ -0,0 +1,104 @@
+&BASIC
+ nrun = 99999999
+ dt = 0.01
+ tmax = 500
+ maxruntime = 72000
+ job2load = -1
+/
+&GRID
+ pmax = 2
+ jmax = 1
+ Nx = 128
+ Lx = 80
+ Ny = 64
+ Ly = 80
+ Nz = 24
+ SG = .t.
+ Nexc = 1
+/
+&GEOMETRY
+ geom = 'Z-pinch'
+ q0 = 0.0
+ shear = 0.0
+ eps = 0.0
+ kappa = 1.0
+ s_kappa= 0.0
+ delta = 0.0
+ s_delta= 0.0
+ zeta = 0.0
+ s_zeta = 0.0
+ parallel_bc = 'shearless'
+ shift_y= 0.0
+ Npol = 1
+/
+&DIAGNOSTICS
+ dtsave_0d = 1
+ dtsave_1d = -1
+ dtsave_2d = -1
+ dtsave_3d = 0.5
+ dtsave_5d = 50
+ write_doubleprecision = .f.
+ write_gamma = .t.
+ write_hf = .t.
+ write_phi = .t.
+ write_Na00 = .t.
+ write_Napj = .t.
+ write_dens = .t.
+ write_fvel = .t.
+ write_temp = .t.
+/
+&MODEL
+ LINEARITY = 'nonlinear'
+ Na = 1 ! number of species
+ mu_x = 1.0
+ mu_y = 1.0
+ N_HD = 4
+ mu_z = 1.0
+ HYP_V = 'hypcoll'
+ mu_p = 0.0
+ mu_j = 0.0
+ nu = 0.05
+ beta = 0.0
+ ADIAB_E = .t.
+/
+&CLOSURE
+ !hierarchy_closure='truncation'
+ hierarchy_closure='max_degree'
+ dmax = 2
+ nonlinear_closure='anti_laguerre_aliasing' !(truncation,full_sum,anti_laguerre_aliasing)
+ nmax = 1
+/
+&SPECIES
+ ! ions
+ name_ = 'ions'
+ tau_ = 1.0
+ sigma_= 1.0
+ q_ = 1.0
+ k_N_ = 0.0
+ k_T_ = 6.96
+/
+&SPECIES
+ ! electrons
+ name_ = 'electrons'
+ tau_ = 1.0
+ sigma_= 0.023338
+ q_ =-1.0
+ k_N_ = 1.6
+ k_T_ = 0.4
+/
+&COLLISION
+ collision_model = 'DG' !DG/SG/PA/LD (dougherty, sugama, pitch angle, landau)
+ GK_CO = .f.
+ INTERSPECIES = .true.
+ mat_file = 'gk_sugama_P_20_J_10_N_150_kpm_8.0.h5'
+/
+&INITIAL
+ INIT_OPT = 'blob' !(phi,blob)
+ ACT_ON_MODES = 'donothing'
+ init_background = 0.0
+ init_noiselvl = 0.005
+ iseed = 42
+/
+&TIME_INTEGRATION
+ numerical_scheme = 'RK4'
+/
diff --git a/testcases/ExB_shear_demo/2D_Z_pinch/fort_00.90 b/testcases/ITG_zpinch/NO_SG/fort_00.90
similarity index 63%
rename from testcases/ExB_shear_demo/2D_Z_pinch/fort_00.90
rename to testcases/ITG_zpinch/NO_SG/fort_00.90
index b991ce561622e5e319e339e8402a70ff450d8381..381ace207c4e3c115a4066627e74a2ad529a10fb 100644
--- a/testcases/ExB_shear_demo/2D_Z_pinch/fort_00.90
+++ b/testcases/ITG_zpinch/NO_SG/fort_00.90
@@ -1,6 +1,6 @@
&BASIC
- nrun = 1e6
- dt = 0.05
+ nrun = 99999999
+ dt = 0.02
tmax = 100
maxruntime = 72000
job2load = -1
@@ -8,23 +8,34 @@
&GRID
pmax = 2
jmax = 1
- Nx = 128
- Lx = 200
+ Nx = 64
+ Lx = 80
Ny = 48
- Ly = 60
- Nz = 1
+ Ly = 80
+ Nz = 16
SG = .f.
Nexc = 1
/
&GEOMETRY
- geom = 'z-pinch'
+ geom = 'Z-pinch'
+ q0 = 0.0
+ shear = 0.0
+ eps = 0.0
+ kappa = 1.0
+ s_kappa= 0.0
+ delta = 0.0
+ s_delta= 0.0
+ zeta = 0.0
+ s_zeta = 0.0
+ parallel_bc = 'shearless'
+ shift_y= 0.0
/
&DIAGNOSTICS
dtsave_0d = 1
dtsave_1d = -1
- dtsave_2d = 0.5
+ dtsave_2d = -1
dtsave_3d = 0.5
- dtsave_5d = 100
+ dtsave_5d = 50
write_doubleprecision = .f.
write_gamma = .t.
write_hf = .t.
@@ -37,22 +48,21 @@
/
&MODEL
LINEARITY = 'nonlinear'
- Na = 2 ! number of species
- mu_x = 1.0
- mu_y = 1.0
+ Na = 1 ! number of species
+ mu_x = 0.0
+ mu_y = 0.0
N_HD = 4
mu_z = 0.0
HYP_V = 'hypcoll'
mu_p = 0.0
mu_j = 0.0
- nu = 0.1
+ nu = 0.05
beta = 0.0
- ADIAB_E = .f.
- tau_i = 1.0
+ ADIAB_E = .t.
/
&CLOSURE
- hierarchy_closure='truncation'
- !hierarchy_closure='max_degree'
+ !hierarchy_closure='truncation'
+ hierarchy_closure='max_degree'
dmax = 2
nonlinear_closure='anti_laguerre_aliasing' !(truncation,full_sum,anti_laguerre_aliasing)
nmax = -1
@@ -63,8 +73,8 @@
tau_ = 1.0
sigma_= 1.0
q_ = 1.0
- k_N_ = 2.0
- k_T_ = 0.4
+ k_N_ = 0.0
+ k_T_ = 4.0
/
&SPECIES
! electrons
@@ -72,15 +82,18 @@
tau_ = 1.0
sigma_= 0.023338
q_ =-1.0
- k_N_ = 2.0
+ k_N_ = 1.6
k_T_ = 0.4
/
&COLLISION
collision_model = 'DG' !DG/SG/PA/LD (dougherty, sugama, pitch angle, landau)
GK_CO = .t.
+ INTERSPECIES = .true.
+ mat_file = 'gk_sugama_P_20_J_10_N_150_kpm_8.0.h5'
/
&INITIAL
INIT_OPT = 'phi' !(phi,blob)
+ ACT_ON_MODES = 'donothing'
init_background = 0.0
init_noiselvl = 0.005
iseed = 42
diff --git a/testcases/ExB_shear_demo/2D_Z_pinch/GS2_method/fort_01.90 b/testcases/ITG_zpinch/PAR_DIFF/fort_00.90
similarity index 60%
rename from testcases/ExB_shear_demo/2D_Z_pinch/GS2_method/fort_01.90
rename to testcases/ITG_zpinch/PAR_DIFF/fort_00.90
index ed6756860ba2caff661e5992d3000c7811335c7f..30fdace3f704b6418134cc0d8df9c2992bef1716 100644
--- a/testcases/ExB_shear_demo/2D_Z_pinch/GS2_method/fort_01.90
+++ b/testcases/ITG_zpinch/PAR_DIFF/fort_00.90
@@ -1,30 +1,41 @@
&BASIC
- nrun = 1e6
- dt = 0.05
- tmax = 200
+ nrun = 99999999
+ dt = 0.02
+ tmax = 100
maxruntime = 72000
- job2load = 0
+ job2load = -1
/
&GRID
pmax = 2
jmax = 1
- Nx = 128
- Lx = 200
+ Nx = 64
+ Lx = 80
Ny = 48
- Ly = 60
- Nz = 1
+ Ly = 80
+ Nz = 16
SG = .f.
Nexc = 1
/
&GEOMETRY
- geom = 'z-pinch'
+ geom = 'Z-pinch'
+ q0 = 0.0
+ shear = 0.0
+ eps = 0.0
+ kappa = 1.0
+ s_kappa= 0.0
+ delta = 0.0
+ s_delta= 0.0
+ zeta = 0.0
+ s_zeta = 0.0
+ parallel_bc = 'shearless'
+ shift_y= 0.0
/
&DIAGNOSTICS
dtsave_0d = 1
dtsave_1d = -1
- dtsave_2d = 0.5
+ dtsave_2d = -1
dtsave_3d = 0.5
- dtsave_5d = 100
+ dtsave_5d = 50
write_doubleprecision = .f.
write_gamma = .t.
write_hf = .t.
@@ -37,23 +48,21 @@
/
&MODEL
LINEARITY = 'nonlinear'
- Na = 2 ! number of species
- mu_x = 1.0
- mu_y = 1.0
+ Na = 1 ! number of species
+ mu_x = 0.0
+ mu_y = 0.0
N_HD = 4
- mu_z = 0.0
+ mu_z = 0.2
HYP_V = 'hypcoll'
mu_p = 0.0
mu_j = 0.0
- nu = 0.1
+ nu = 0.05
beta = 0.0
- ADIAB_E = .f.
- tau_i = 1.0
- ExBrate = 0.5
+ ADIAB_E = .t.
/
&CLOSURE
- hierarchy_closure='truncation'
- !hierarchy_closure='max_degree'
+ !hierarchy_closure='truncation'
+ hierarchy_closure='max_degree'
dmax = 2
nonlinear_closure='anti_laguerre_aliasing' !(truncation,full_sum,anti_laguerre_aliasing)
nmax = -1
@@ -64,8 +73,8 @@
tau_ = 1.0
sigma_= 1.0
q_ = 1.0
- k_N_ = 2.0
- k_T_ = 0.4
+ k_N_ = 0.0
+ k_T_ = 4.0
/
&SPECIES
! electrons
@@ -73,15 +82,18 @@
tau_ = 1.0
sigma_= 0.023338
q_ =-1.0
- k_N_ = 2.0
+ k_N_ = 1.6
k_T_ = 0.4
/
&COLLISION
collision_model = 'DG' !DG/SG/PA/LD (dougherty, sugama, pitch angle, landau)
GK_CO = .t.
+ INTERSPECIES = .true.
+ mat_file = 'gk_sugama_P_20_J_10_N_150_kpm_8.0.h5'
/
&INITIAL
INIT_OPT = 'phi' !(phi,blob)
+ ACT_ON_MODES = 'donothing'
init_background = 0.0
init_noiselvl = 0.005
iseed = 42
diff --git a/testcases/ITG_zpinch/fort.90 b/testcases/ITG_zpinch/fort.90
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/testcases/ITG_zpinch/fort_00.90 b/testcases/ITG_zpinch/fort_00.90
index 87253b73dd8669e3481ffc76c1e920fd59f5d150..522164900fc4152cfd9b103684cec6ee97433096 100644
--- a/testcases/ITG_zpinch/fort_00.90
+++ b/testcases/ITG_zpinch/fort_00.90
@@ -1,19 +1,19 @@
&BASIC
nrun = 99999999
dt = 0.01
- tmax = 250
+ tmax = 500
maxruntime = 72000
job2load = -1
/
&GRID
pmax = 2
jmax = 1
- Nx = 64
- Lx = 120
- Ny = 48
- Ly = 120
- Nz = 16
- SG = .f.
+ Nx = 128
+ Lx = 80
+ Ny = 64
+ Ly = 80
+ Nz = 1
+ SG = .t.
Nexc = 1
/
&GEOMETRY
@@ -34,8 +34,8 @@
dtsave_0d = 1
dtsave_1d = -1
dtsave_2d = -1
- dtsave_3d = 1
- dtsave_5d = 10
+ dtsave_3d = 0.5
+ dtsave_5d = 50
write_doubleprecision = .f.
write_gamma = .t.
write_hf = .t.
@@ -49,8 +49,8 @@
&MODEL
LINEARITY = 'nonlinear'
Na = 1 ! number of species
- mu_x = 0.0
- mu_y = 0.0
+ mu_x = 1.0
+ mu_y = 1.0
N_HD = 4
mu_z = 0.0
HYP_V = 'hypcoll'
@@ -59,14 +59,13 @@
nu = 0.05
beta = 0.0
ADIAB_E = .t.
- tau_e = 1.0
/
&CLOSURE
!hierarchy_closure='truncation'
hierarchy_closure='max_degree'
dmax = 2
nonlinear_closure='anti_laguerre_aliasing' !(truncation,full_sum,anti_laguerre_aliasing)
- nmax = -1
+ nmax = 1
/
&SPECIES
! ions
@@ -75,7 +74,7 @@
sigma_= 1.0
q_ = 1.0
k_N_ = 0.0
- k_T_ = 4.0
+ k_T_ = 6.96
/
&SPECIES
! electrons
@@ -88,7 +87,7 @@
/
&COLLISION
collision_model = 'DG' !DG/SG/PA/LD (dougherty, sugama, pitch angle, landau)
- GK_CO = .t.
+ GK_CO = .f.
INTERSPECIES = .true.
mat_file = 'gk_sugama_P_20_J_10_N_150_kpm_8.0.h5'
/
diff --git a/testcases/ITG_zpinch/fort_01.90 b/testcases/ITG_zpinch/fort_01.90
new file mode 100644
index 0000000000000000000000000000000000000000..3f22e004be173a628ab9e2e72f95ef8eda9446d1
--- /dev/null
+++ b/testcases/ITG_zpinch/fort_01.90
@@ -0,0 +1,103 @@
+&BASIC
+ nrun = 99999999
+ dt = 0.01
+ tmax = 1000
+ maxruntime = 72000
+ job2load = 0
+/
+&GRID
+ pmax = 2
+ jmax = 1
+ Nx = 128
+ Lx = 80
+ Ny = 64
+ Ly = 80
+ Nz = 16
+ SG = .t.
+ Nexc = 1
+/
+&GEOMETRY
+ geom = 'Z-pinch'
+ q0 = 0.0
+ shear = 0.0
+ eps = 0.0
+ kappa = 1.0
+ s_kappa= 0.0
+ delta = 0.0
+ s_delta= 0.0
+ zeta = 0.0
+ s_zeta = 0.0
+ parallel_bc = 'shearless'
+ shift_y= 0.0
+/
+&DIAGNOSTICS
+ dtsave_0d = 1
+ dtsave_1d = -1
+ dtsave_2d = -1
+ dtsave_3d = 0.5
+ dtsave_5d = 50
+ write_doubleprecision = .f.
+ write_gamma = .t.
+ write_hf = .t.
+ write_phi = .t.
+ write_Na00 = .t.
+ write_Napj = .t.
+ write_dens = .t.
+ write_fvel = .t.
+ write_temp = .t.
+/
+&MODEL
+ LINEARITY = 'nonlinear'
+ Na = 1 ! number of species
+ mu_x = 1.0
+ mu_y = 1.0
+ N_HD = 4
+ mu_z = 0.0
+ HYP_V = 'hypcoll'
+ mu_p = 0.0
+ mu_j = 0.0
+ nu = 0.05
+ beta = 0.0
+ ADIAB_E = .t.
+/
+&CLOSURE
+ !hierarchy_closure='truncation'
+ hierarchy_closure='max_degree'
+ dmax = 2
+ nonlinear_closure='anti_laguerre_aliasing' !(truncation,full_sum,anti_laguerre_aliasing)
+ nmax = 1
+/
+&SPECIES
+ ! ions
+ name_ = 'ions'
+ tau_ = 1.0
+ sigma_= 1.0
+ q_ = 1.0
+ k_N_ = 0.0
+ k_T_ = 6.96
+/
+&SPECIES
+ ! electrons
+ name_ = 'electrons'
+ tau_ = 1.0
+ sigma_= 0.023338
+ q_ =-1.0
+ k_N_ = 1.6
+ k_T_ = 0.4
+/
+&COLLISION
+ collision_model = 'DG' !DG/SG/PA/LD (dougherty, sugama, pitch angle, landau)
+ GK_CO = .f.
+ INTERSPECIES = .true.
+ mat_file = 'gk_sugama_P_20_J_10_N_150_kpm_8.0.h5'
+/
+&INITIAL
+ INIT_OPT = 'blob' !(phi,blob)
+ ACT_ON_MODES = 'donothing'
+ init_background = 0.0
+ init_noiselvl = 0.005
+ iseed = 42
+/
+&TIME_INTEGRATION
+ numerical_scheme = 'RK4'
+/
diff --git a/testcases/Rosenbluth_Hinton_test/fort_00.90 b/testcases/Rosenbluth_Hinton_test/fort_00.90
new file mode 100644
index 0000000000000000000000000000000000000000..bc86583eef35435c1298ac6ad684f9aaa7c8bfed
--- /dev/null
+++ b/testcases/Rosenbluth_Hinton_test/fort_00.90
@@ -0,0 +1,101 @@
+&BASIC
+ nrun = 99999999
+ dt = 0.025
+ tmax = 25
+ maxruntime = 72000
+ job2load = -1
+/
+&GRID
+ pmax = 32
+ jmax = 0
+ Nx = 2
+ Lx = 120
+ Ny = 2
+ Ly = 120
+ Nz = 24
+ SG = .f.
+ Nexc = 0
+/
+&GEOMETRY
+ geom = 's-alpha'
+ !geom = 'miller'
+ q0 = 1.4
+ shear = 0.0
+ eps = 0.1
+ kappa = 1.0
+ s_kappa= 0.0
+ delta = 0.0
+ s_delta= 0.0
+ zeta = 0.0
+ s_zeta = 0.0
+ parallel_bc = 'dirichlet'
+ shift_y= 0.0
+/
+&DIAGNOSTICS
+ dtsave_0d = 1
+ dtsave_1d = -1
+ dtsave_2d = -1
+ dtsave_3d = 0.1
+ dtsave_5d = 20
+ write_doubleprecision = .f.
+ write_gamma = .t.
+ write_hf = .t.
+ write_phi = .t.
+ write_Na00 = .t.
+ write_Napj = .t.
+ write_dens = .t.
+ write_fvel = .t.
+ write_temp = .t.
+/
+&MODEL
+ LINEARITY = 'linear'
+ Na = 1 ! number of species
+ mu_x = 0.0
+ mu_y = 0.0
+ N_HD = 4
+ mu_z = 0.0
+ HYP_V = 'hypcoll'
+ mu_p = 0.0
+ mu_j = 0.0
+ nu = 0.01
+ beta = 0.0
+ ADIAB_E = .t.
+/
+&CLOSURE
+ hierarchy_closure='truncation'
+ dmax = -1
+ nonlinear_closure='truncation'
+ nmax = 0
+/
+&SPECIES
+ ! ions
+ name_ = 'ions'
+ tau_ = 1.0
+ sigma_= 1.0
+ q_ = 1.0
+ k_N_ = 0
+ k_T_ = 0
+/
+
+&COLLISION
+ collision_model = 'DG' !DG/SG/PA/LD (dougherty, sugama, pitch angle, landau)
+ GK_CO = .f.
+ INTERSPECIES = .true.
+ mat_file = 'gk_sugama_P_20_J_10_N_150_kpm_8.0.h5'
+/
+&INITIAL
+ INIT_OPT = 'mom00'
+ !INIT_OPT = 'mom00_mode'
+ init_background = 1.0
+ init_noiselvl = 0
+ iseed = 42
+ Nmodes = 1
+/
+&MODE
+ I_ = 1
+ J_ = 0
+ amp_ = 1.0
+/
+&TIME_INTEGRATION
+ numerical_scheme = 'RK4'
+/
diff --git a/testcases/cyclone_example/Z_pinch/fort_00.90 b/testcases/cyclone_example/Z_pinch/fort_00.90
new file mode 100644
index 0000000000000000000000000000000000000000..96c03136dd6b2778c54337686dfa9457e0050baf
--- /dev/null
+++ b/testcases/cyclone_example/Z_pinch/fort_00.90
@@ -0,0 +1,96 @@
+&BASIC
+ nrun = 99999999
+ dt = 0.01
+ tmax = 50
+ maxruntime = 72000
+ job2load = -1
+/
+&GRID
+ pmax = 4
+ jmax = 1
+ Nx = 64
+ Lx = 120
+ Ny = 48
+ Ly = 120
+ Nz = 16
+ SG = .f.
+ Nexc = 0
+/
+&GEOMETRY
+ geom = 'Z-pinch'
+ !geom = 'miller'
+ q0 = 100!1.4
+ shear = 0.0!0.8
+ eps = 0.001!0.18
+ kappa = 1.0
+ s_kappa= 0.0
+ delta = 0.0
+ s_delta= 0.0
+ zeta = 0.0
+ s_zeta = 0.0
+ parallel_bc = 'dirichlet'
+ shift_y= 0.0
+/
+&DIAGNOSTICS
+ dtsave_0d = 0.1
+ dtsave_1d = -1
+ dtsave_2d = -1
+ dtsave_3d = 1
+ dtsave_5d = 20
+ write_doubleprecision = .f.
+ write_gamma = .t.
+ write_hf = .t.
+ write_phi = .t.
+ write_Na00 = .t.
+ write_Napj = .t.
+ write_dens = .t.
+ write_fvel = .t.
+ write_temp = .t.
+/
+&MODEL
+ LINEARITY = 'nonlinear'
+ Na = 1 ! number of species
+ mu_x = 0.0
+ mu_y = 0.0
+ N_HD = 4
+ mu_z = 1.0
+ HYP_V = 'hypcoll'
+ mu_p = 0.0
+ mu_j = 0.0
+ nu = 0.05
+ beta = 0.0
+ ADIAB_E = .t.
+/
+&CLOSURE
+ hierarchy_closure='truncation'
+ dmax = -1
+ nonlinear_closure='truncation'
+ nmax = 0
+/
+&SPECIES
+ ! ions
+ name_ = 'ions'
+ tau_ = 1.0
+ sigma_= 1.0
+ q_ = 1.0
+ k_N_ = 2.22
+ k_T_ = 6.96
+/
+
+&COLLISION
+ collision_model = 'DG' !DG/SG/PA/LD (dougherty, sugama, pitch angle, landau)
+ GK_CO = .f.
+ INTERSPECIES = .true.
+ mat_file = 'gk_sugama_P_20_J_10_N_150_kpm_8.0.h5'
+/
+&INITIAL
+ INIT_OPT = 'blob'
+ ACT_ON_MODES = 'donothing'
+ init_background = 0.0
+ init_noiselvl = 0.005
+ iseed = 42
+/
+&TIME_INTEGRATION
+ numerical_scheme = 'RK4'
+ !numerical_scheme = 'SSP_RK3'
+/
diff --git a/testcases/cyclone_example/Z_pinch_limit/fort_00.90 b/testcases/cyclone_example/Z_pinch_limit/fort_00.90
new file mode 100644
index 0000000000000000000000000000000000000000..a555316f0a3503c4e6ec430e7cb5ca90c4fad25e
--- /dev/null
+++ b/testcases/cyclone_example/Z_pinch_limit/fort_00.90
@@ -0,0 +1,96 @@
+&BASIC
+ nrun = 99999999
+ dt = 0.01
+ tmax = 0.1
+ maxruntime = 72000
+ job2load = -1
+/
+&GRID
+ pmax = 4
+ jmax = 1
+ Nx = 64
+ Lx = 120
+ Ny = 48
+ Ly = 120
+ Nz = 16
+ SG = .f.
+ Nexc = 0
+/
+&GEOMETRY
+ !geom = 's-alpha'
+ geom = 'miller'
+ q0 = 1000!1.4
+ shear = 0.0!0.8
+ eps = 0.001!0.18
+ kappa = 1.0
+ s_kappa= 0.0
+ delta = 0.0
+ s_delta= 0.0
+ zeta = 0.0
+ s_zeta = 0.0
+ parallel_bc = 'dirichlet'
+ shift_y= 0.0
+/
+&DIAGNOSTICS
+ dtsave_0d = 0.1
+ dtsave_1d = -1
+ dtsave_2d = -1
+ dtsave_3d = 1
+ dtsave_5d = 20
+ write_doubleprecision = .f.
+ write_gamma = .t.
+ write_hf = .t.
+ write_phi = .t.
+ write_Na00 = .t.
+ write_Napj = .t.
+ write_dens = .t.
+ write_fvel = .t.
+ write_temp = .t.
+/
+&MODEL
+ LINEARITY = 'nonlinear'
+ Na = 1 ! number of species
+ mu_x = 0.0
+ mu_y = 0.0
+ N_HD = 4
+ mu_z = 1.0
+ HYP_V = 'hypcoll'
+ mu_p = 0.0
+ mu_j = 0.0
+ nu = 0.05
+ beta = 0.0
+ ADIAB_E = .t.
+/
+&CLOSURE
+ hierarchy_closure='truncation'
+ dmax = -1
+ nonlinear_closure='truncation'
+ nmax = 0
+/
+&SPECIES
+ ! ions
+ name_ = 'ions'
+ tau_ = 1.0
+ sigma_= 1.0
+ q_ = 1.0
+ k_N_ = 2.22
+ k_T_ = 6.96
+/
+
+&COLLISION
+ collision_model = 'DG' !DG/SG/PA/LD (dougherty, sugama, pitch angle, landau)
+ GK_CO = .f.
+ INTERSPECIES = .true.
+ mat_file = 'gk_sugama_P_20_J_10_N_150_kpm_8.0.h5'
+/
+&INITIAL
+ INIT_OPT = 'blob'
+ ACT_ON_MODES = 'donothing'
+ init_background = 0.0
+ init_noiselvl = 0.005
+ iseed = 42
+/
+&TIME_INTEGRATION
+ numerical_scheme = 'RK4'
+ !numerical_scheme = 'SSP_RK3'
+/
diff --git a/testcases/cyclone_example/fort_00.90 b/testcases/cyclone_example/fort_00.90
index ce02b619f0d1394c95dc6ecde45bdf99934531b2..abeb5052a73822c2351f43a623f63c2bd25f27b6 100644
--- a/testcases/cyclone_example/fort_00.90
+++ b/testcases/cyclone_example/fort_00.90
@@ -1,7 +1,7 @@
&BASIC
nrun = 99999999
dt = 0.01
- tmax = 5
+ tmax = 50
maxruntime = 72000
job2load = -1
/
@@ -53,7 +53,7 @@
mu_x = 0.0
mu_y = 0.0
N_HD = 4
- mu_z = 1.0
+ mu_z = 2.0
HYP_V = 'hypcoll'
mu_p = 0.0
mu_j = 0.0
@@ -79,7 +79,7 @@
&COLLISION
collision_model = 'DG' !DG/SG/PA/LD (dougherty, sugama, pitch angle, landau)
- GK_CO = .f.
+ GK_CO = .t.
INTERSPECIES = .true.
mat_file = 'gk_sugama_P_20_J_10_N_150_kpm_8.0.h5'
/