From 5d5ddafaa43c4bcf6819cfca7a3ac1e4b7368c95 Mon Sep 17 00:00:00 2001 From: John Omotani Date: Mon, 30 Oct 2023 19:17:46 +0000 Subject: [PATCH] Tidy up comments --- runs/1D-wall_MMS_new_nel_r_1_z_16_vpa_16_vperp_1_krook.toml | 2 -- runs/1D-wall_MMS_new_nel_r_1_z_16_vpa_8_vperp_8_krook.toml | 2 -- src/input_structs.jl | 2 +- src/krook_collisions.jl | 2 +- test/velocity_integral_tests.jl | 3 --- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/runs/1D-wall_MMS_new_nel_r_1_z_16_vpa_16_vperp_1_krook.toml b/runs/1D-wall_MMS_new_nel_r_1_z_16_vpa_16_vperp_1_krook.toml index 5a329be7a..7265dd542 100644 --- a/runs/1D-wall_MMS_new_nel_r_1_z_16_vpa_16_vperp_1_krook.toml +++ b/runs/1D-wall_MMS_new_nel_r_1_z_16_vpa_16_vperp_1_krook.toml @@ -31,7 +31,6 @@ z_IC_temperature_amplitude2 = 0.0 z_IC_temperature_phase2 = 0.0 charge_exchange_frequency = 0.0 ionization_frequency = 0.0 -#krook_collisions = false krook_collisions_option = "manual" nuii_krook = 1.0 nstep = 2000 @@ -60,7 +59,6 @@ vperp_ngrid = 1 vperp_nelement = 1 vperp_L = 6.0 vperp_bc = "periodic" -#vperp_discretization = "finite_difference" vperp_discretization = "chebyshev_pseudospectral" vz_ngrid = 17 diff --git a/runs/1D-wall_MMS_new_nel_r_1_z_16_vpa_8_vperp_8_krook.toml b/runs/1D-wall_MMS_new_nel_r_1_z_16_vpa_8_vperp_8_krook.toml index 5173fa230..4d35a8a77 100644 --- a/runs/1D-wall_MMS_new_nel_r_1_z_16_vpa_8_vperp_8_krook.toml +++ b/runs/1D-wall_MMS_new_nel_r_1_z_16_vpa_8_vperp_8_krook.toml @@ -31,7 +31,6 @@ z_IC_temperature_amplitude2 = 0.0 z_IC_temperature_phase2 = 0.0 charge_exchange_frequency = 0.0 ionization_frequency = 0.0 -#krook_collisions = false krook_collisions_option = "manual" nuii_krook = 1.0 nstep = 2000 @@ -60,7 +59,6 @@ vperp_ngrid = 17 vperp_nelement = 8 vperp_L = 6.0 vperp_bc = "periodic" -#vperp_discretization = "finite_difference" vperp_discretization = "chebyshev_pseudospectral" vz_ngrid = 17 diff --git a/src/input_structs.jl b/src/input_structs.jl index f7734a982..be8a19969 100644 --- a/src/input_structs.jl +++ b/src/input_structs.jl @@ -306,7 +306,7 @@ mutable struct collisions_input constant_ionization_rate::Bool # Coulomb collision rate at the reference density and temperature krook_collision_frequency_prefactor::mk_float - # Coulomb collision rate at the reference density and temperature + # Setting to switch between different options for Krook collision operator krook_collisions_option::String end diff --git a/src/krook_collisions.jl b/src/krook_collisions.jl index b77db5bf1..f6ceec9c4 100644 --- a/src/krook_collisions.jl +++ b/src/krook_collisions.jl @@ -50,7 +50,7 @@ function krook_collisions!(pdf_out, fvec_in, moments, composition, collisions, v # normalized by sqrt(pi) (see velocity_moments.integrate_over_vspace). if collisions.krook_collisions_option == "manual" cfac = 0.0 - else # default option, collisions.krook_collisions_option == "default" + else # default option, collisions.krook_collisions_option == "reference_parameters" cfac = 1.0 end if moments.evolve_ppar && moments.evolve_upar diff --git a/test/velocity_integral_tests.jl b/test/velocity_integral_tests.jl index dc84800f0..07d0c5027 100644 --- a/test/velocity_integral_tests.jl +++ b/test/velocity_integral_tests.jl @@ -81,7 +81,6 @@ function runtests() ppar_test = get_ppar(dfn,vpa,vperp,upar_test) pperp_test = get_pperp(dfn,vpa,vperp) pres_test = pressure(ppar_test,pperp_test) - # output test results @test isapprox(dens_test, dens; atol=atol) @test isapprox(upar_test, upar; atol=atol) @test isapprox(pres_test, pres; atol=atol) @@ -102,7 +101,6 @@ function runtests() dens_test = get_density(dfn1D,vz,vr) upar_test = get_upar(dfn1D,vz,vr,dens_test) ppar_test = get_ppar(dfn1D,vz,vr,upar_test) - # output test results @test isapprox(dens_test, dens; atol=atol) @test isapprox(upar_test, upar; atol=atol) @test isapprox(ppar_test, ppar; atol=atol) @@ -131,7 +129,6 @@ function runtests() upar_test = get_upar(dfn,vpa,vperp,dens_test) ppar_test = get_ppar(dfn,vpa,vperp,upar_test) pperp_test = get_pperp(dfn,vpa,vperp) - # output test results @test isapprox(dens_test, dens; atol=atol) @test isapprox(upar_test, upar; atol=atol)