From 5264460bd0f44d9536a1daceb5524c3e5a8fbed3 Mon Sep 17 00:00:00 2001 From: Antoine Hoffmann <antoine.hoffmann@epfl.ch> Date: Tue, 26 Sep 2023 16:20:00 +0200 Subject: [PATCH] update testcases --- testcases/CBC_ExBshear/fort_00.90 | 8 +- testcases/CBC_ExBshear/fort_01.90 | 97 +++++++++++++++++ testcases/CBC_ExBshear/fort_02.90 | 98 +++++++++++++++++ testcases/ExB_shear_atomic_tests/fort_00.90 | 1 - testcases/ExB_shear_atomic_tests/fort_03.90 | 19 ++-- testcases/ExB_shear_atomic_tests/fort_04.90 | 21 ++-- testcases/ExB_shear_atomic_tests/fort_05.90 | 34 +++--- testcases/ExB_shear_atomic_tests/fort_06.90 | 110 ++++++++++++++++++++ wk/test_ExB_shear.m | 30 +++--- 9 files changed, 371 insertions(+), 47 deletions(-) create mode 100644 testcases/CBC_ExBshear/fort_01.90 create mode 100644 testcases/CBC_ExBshear/fort_02.90 create mode 100644 testcases/ExB_shear_atomic_tests/fort_06.90 diff --git a/testcases/CBC_ExBshear/fort_00.90 b/testcases/CBC_ExBshear/fort_00.90 index a65bd044..b26e8952 100644 --- a/testcases/CBC_ExBshear/fort_00.90 +++ b/testcases/CBC_ExBshear/fort_00.90 @@ -50,17 +50,17 @@ &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 = 1.0 HYP_V = 'hypcoll' mu_p = 0.0 mu_j = 0.0 - nu = 0.05 + nu = 1.00 beta = 0.0 ADIAB_E = .t. - ExBrate = 0.01 + ExBrate = 0.0 / &CLOSURE hierarchy_closure='truncation' diff --git a/testcases/CBC_ExBshear/fort_01.90 b/testcases/CBC_ExBshear/fort_01.90 new file mode 100644 index 00000000..bf5ea997 --- /dev/null +++ b/testcases/CBC_ExBshear/fort_01.90 @@ -0,0 +1,97 @@ +&BASIC + nrun = 99999999 + dt = 0.01 + tmax = 100 + maxruntime = 72000 + job2load = 0 +/ +&GRID + pmax = 2 + jmax = 1 + Nx = 64 + Lx = 120 + Ny = 48 + Ly = 120 + Nz = 16 + SG = .f. + Nexc = 0 +/ +&GEOMETRY + geom = 's-alpha' + !geom = 'miller' + q0 = 1.4 + shear = 0.8 + eps = 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 = 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 = 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 = 1.0 + beta = 0.0 + ADIAB_E = .t. + ExBrate = 0.01 +/ +&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/CBC_ExBshear/fort_02.90 b/testcases/CBC_ExBshear/fort_02.90 new file mode 100644 index 00000000..d23829b7 --- /dev/null +++ b/testcases/CBC_ExBshear/fort_02.90 @@ -0,0 +1,98 @@ +&BASIC + nrun = 99999999 + dt = 0.01 + tmax = 150 + maxruntime = 72000 + job2load = 1 +/ +&GRID + pmax = 2 + jmax = 1 + Nx = 64 + Lx = 120 + Ny = 48 + Ly = 120 + Nz = 16 + SG = .f. + Nexc = 0 +/ +&GEOMETRY + geom = 's-alpha' + !geom = 'miller' + q0 = 1.4 + shear = 0.8 + eps = 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 = 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 = 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 = 1.0 + beta = 0.0 + ADIAB_E = .t. + ExBrate = 0.5 + ExB_NL_CORRECTION = .false. +/ +&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/ExB_shear_atomic_tests/fort_00.90 b/testcases/ExB_shear_atomic_tests/fort_00.90 index 29ec2972..9bc39d2e 100644 --- a/testcases/ExB_shear_atomic_tests/fort_00.90 +++ b/testcases/ExB_shear_atomic_tests/fort_00.90 @@ -94,7 +94,6 @@ RM_LD_T_EQ= .false. / &INITIAL INIT_OPT = 'ricci' - init_amp = 0.1 / &TIME_INTEGRATION numerical_scheme = 'RK4' diff --git a/testcases/ExB_shear_atomic_tests/fort_03.90 b/testcases/ExB_shear_atomic_tests/fort_03.90 index 6a943378..a8ac8ded 100644 --- a/testcases/ExB_shear_atomic_tests/fort_03.90 +++ b/testcases/ExB_shear_atomic_tests/fort_03.90 @@ -1,7 +1,7 @@ &BASIC nrun = 100000000 dt = 0.001 - tmax = 2.0 + tmax = 1.0 maxruntime = 356400 job2load = -1 / @@ -9,9 +9,9 @@ pmax = 0 jmax = 0 Nx = 96 - Lx = 100 - Ny = 64 - Ly = 100 + Lx = 120 + Ny = 32 + Ly = 80 Nz = 1 SG = .false. Nexc = 1 @@ -92,10 +92,13 @@ RM_LD_T_EQ= .false. collision_kcut = 1 / &INITIAL - INIT_OPT = 'mom00_single_mode' - init_amp = 1000 - ikx_init = 3 - iky_init = 3 + INIT_OPT = 'mom00_modes' + Nmodes = 1 +/ +&MODE + I_ = 2 + J_ = 2 + amp_ = 1000 / &TIME_INTEGRATION numerical_scheme = 'RK4' diff --git a/testcases/ExB_shear_atomic_tests/fort_04.90 b/testcases/ExB_shear_atomic_tests/fort_04.90 index 3506310b..efc03cda 100644 --- a/testcases/ExB_shear_atomic_tests/fort_04.90 +++ b/testcases/ExB_shear_atomic_tests/fort_04.90 @@ -1,17 +1,17 @@ &BASIC nrun = 100000000 dt = 0.001 - tmax = 2.0 + tmax = 1.0 maxruntime = 356400 job2load = -1 / &GRID pmax = 0 jmax = 0 - Nx = 96 - Lx = 100 - Ny = 64 - Ly = 100 + Nx = 32 + Lx = 120 + Ny = 16 + Ly = 80 Nz = 1 SG = .false. Nexc = 1 @@ -92,10 +92,13 @@ RM_LD_T_EQ= .false. collision_kcut = 1 / &INITIAL - INIT_OPT = 'mom00_single_mode' - init_amp = 1000 - ikx_init = 3 - iky_init = 3 + INIT_OPT = 'mom00_modes' + Nmodes = 1 +/ +&MODE + I_ = 2 + J_ = 2 + amp_ = 1000 / &TIME_INTEGRATION numerical_scheme = 'RK4' diff --git a/testcases/ExB_shear_atomic_tests/fort_05.90 b/testcases/ExB_shear_atomic_tests/fort_05.90 index 9fcce56d..4f39366f 100644 --- a/testcases/ExB_shear_atomic_tests/fort_05.90 +++ b/testcases/ExB_shear_atomic_tests/fort_05.90 @@ -1,17 +1,17 @@ &BASIC nrun = 100000000 - dt = 0.001 - tmax = 5.0 + dt = 0.2 + tmax = 100 maxruntime = 356400 job2load = -1 / &GRID pmax = 0 jmax = 0 - Nx = 96 - Lx = 120 - Ny = 64 - Ly = 90 + Nx = 54 + Lx = 1257 + Ny = 32 + Ly = 628 Nz = 1 SG = .false. Nexc = 1 @@ -33,10 +33,10 @@ PB_PHASE= .false. / &DIAGNOSTICS - dtsave_0d = 0.05 + dtsave_0d = 0.5 dtsave_1d = -1 dtsave_2d = -1 - dtsave_3d = 0.05 + dtsave_3d = 1 dtsave_5d = 100 write_doubleprecision = .true. write_gamma = .true. @@ -63,8 +63,8 @@ RM_LD_T_EQ= .false. k_cB = 0 lambdaD = 0 beta = 0.0 - ExBrate = 3.0 - ExB_NL_CORRECTION = .true. + ExBrate = 0.0016 + ExB_NL_CORRECTION = .f. ADIAB_E = .true. ADIAB_I = .false. tau_i = 1 @@ -92,8 +92,18 @@ RM_LD_T_EQ= .false. collision_kcut = 1 / &INITIAL - INIT_OPT = 'mom00_single_mode' - init_amp = 100 + INIT_OPT = 'mom00_modes' + Nmodes = 2 +/ +&MODE + I_ = -12 + J_ = 3 + amp_ = 1 +/ +&MODE + I_ = 14 + J_ = 5 + amp_ = 1 / &TIME_INTEGRATION numerical_scheme = 'RK4' diff --git a/testcases/ExB_shear_atomic_tests/fort_06.90 b/testcases/ExB_shear_atomic_tests/fort_06.90 new file mode 100644 index 00000000..9056c692 --- /dev/null +++ b/testcases/ExB_shear_atomic_tests/fort_06.90 @@ -0,0 +1,110 @@ +&BASIC + nrun = 100000000 + dt = 0.2 + tmax = 100 + maxruntime = 356400 + job2load = -1 +/ +&GRID + pmax = 0 + jmax = 0 + Nx = 54 + Lx = 1257 + Ny = 32 + Ly = 628 + 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.5 + dtsave_1d = -1 + dtsave_2d = -1 + dtsave_3d = 1 + 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 = 0 + mu_y = 0 + 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.0016 + ExB_NL_CORRECTION = .t. + ADIAB_E = .true. + ADIAB_I = .false. + tau_i = 1 + MHD_PD = .false. +/ +&CLOSURE + hierarchy_closure='truncation' + dmax =-1 + nonlinear_closure='truncation' + nmax =-1 +/ +&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_modes' + Nmodes = 2 +/ +&MODE + I_ = -12 + J_ = 3 + amp_ = 1 +/ +&MODE + I_ = 14 + J_ = 5 + amp_ = 1 +/ +&TIME_INTEGRATION + numerical_scheme = 'RK4' +/ diff --git a/wk/test_ExB_shear.m b/wk/test_ExB_shear.m index 26484c7b..8e5558fb 100644 --- a/wk/test_ExB_shear.m +++ b/wk/test_ExB_shear.m @@ -3,19 +3,22 @@ MVIN = ['cd ',resdir]; curdir = pwd; MVOUT = ['cd ',curdir]; %------ -MPIRUN = '/opt/homebrew/bin/mpirun'; -% MPIRUN = 'mpirun'; +if strcmp(curdir(1:5),'/home') + MPIRUN = 'mpirun'; +else + MPIRUN = '/opt/homebrew/bin/mpirun'; +end %------ -% EXECDIR = '/home/ahoffman/gyacomo/bin/'; -EXECDIR = '/Users/ahoffmann/gyacomo/bin/'; +EXECDIR = [curdir(1:end-2),'bin/']; % EXECNAME = 'gyacomo23_dp_O1'; -EXECNAME = 'gyacomo23_dp'; +% EXECNAME = 'gyacomo23_dp'; % EXECNAME = 'gyacomo23_sp'; +EXECNAME = 'gyacomo23_test'; % EXECNAME = 'gyacomo23_debug'; -%------ -% NP = '1'; PARA = '1 1 1'; +% ------ +NP = '1'; PARA = '1 1 1'; % NP = '2'; PARA = '1 2 1'; -NP = '6'; PARA = '1 6 1'; +% NP = '6'; PARA = '1 6 1'; %------ % Picture, const. zonal mode in phi in nonlin term % INNAME = '0'; @@ -23,13 +26,14 @@ NP = '6'; PARA = '1 6 1'; % INNAME = '1'; % NL with padrallel modes initialization no ExB shear % INNAME = '2'; -% NL with parallel modes initialization with ExB shear, no with factor +% NL with parallel modes initialization with ExB shear, no factor % INNAME = '3'; % NL with parallel modes initialization with ExB shear, with factor -INNAME = '4'; -% NL with parallel modes initialization + ExB shear -% INNAME = '5'; - +% INNAME = '4'; +% Mcmillan et al. 2019 no correction +% INNAME = '5'; +% Mcmillan et al. 2019 correction +INNAME = '6'; %------- RUN = [MPIRUN,' -np ',NP,' ',EXECDIR,EXECNAME,' ',PARA,' ',INNAME]; system([MVIN,'; ',RUN,'; ',MVOUT]); -- GitLab