Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 'longtest' CI job #158

Merged
merged 4 commits into from
Nov 22, 2023
Merged

Fix 'longtest' CI job #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e30b687
Remove some unneeded arguments from 'longtest' CI job
johnomotani Nov 22, 2023
b93a6f2
Export close_run_info from makie_post_processing
johnomotani Nov 22, 2023
b6e2f68
Close the `run_info` in restart_interpolation_tests.jl
johnomotani Nov 22, 2023
c91e537
Slice vzeta and vr for f_neutral while loading in restart interp test
johnomotani Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/longtest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ jobs:
#
- run: |
pip3 install --user matplotlib
julia --check-bounds=yes --color=yes --depwarn=yes --inline=yes --project=@. -e 'import Pkg; Pkg.test(; coverage = :true, test_args=["--long"])'
julia --check-bounds=yes --color=yes --depwarn=yes --project=@. -e 'import Pkg; Pkg.test(; test_args=["--long"])'
shell: bash
2 changes: 1 addition & 1 deletion src/makie_post_processing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ julia --project run_makie_post_processing.jl dir1 [dir2 [dir3 ...]]
module makie_post_processing

export makie_post_process, generate_example_input_file, get_variable,
setup_makie_post_processing_input!, get_run_info
setup_makie_post_processing_input!, get_run_info, close_run_info
export animate_f_unnorm_vs_vpa, animate_f_unnorm_vs_vpa_z, get_1d_ax, get_2d_ax,
irregular_heatmap, irregular_heatmap!, plot_f_unnorm_vs_vpa,
plot_f_unnorm_vs_vpa_z, positive_or_nan, postproc_load_variable, positive_or_nan,
Expand Down
33 changes: 20 additions & 13 deletions test/restart_interpolation_tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ using moment_kinetics.load_data: open_readonly_output_file, load_coordinate_data
load_neutral_particle_moments_data,
load_neutral_pdf_data, load_time_data, load_species_data
using moment_kinetics.interpolation: interpolate_to_grid_z, interpolate_to_grid_vpa
using moment_kinetics.makie_post_processing: get_run_info, postproc_load_variable
using moment_kinetics.makie_post_processing: get_run_info, close_run_info,
postproc_load_variable
using moment_kinetics.type_definitions: mk_float

include("nonlinear_sound_wave_inputs_and_expected_data.jl")
Expand Down Expand Up @@ -136,6 +137,16 @@ function run_test(test_input, base, message, rtol, atol; tol_3V, kwargs...)
path = joinpath(realpath(input["base_directory"]), name)

run_info = get_run_info((path, -1); dfns=true)
z = run_info.z
z_spectral = run_info.z_spectral
vpa = run_info.vpa
vpa_spectral = run_info.vpa_spectral
vzeta = run_info.vzeta
vzeta_spectral = run_info.vzeta_spectral
vr = run_info.vr
vr_spectral = run_info.vr_spectral
vz = run_info.vz
vz_spectral = run_info.vz_spectral
time = run_info.time
n_ion_species = run_info.n_ion_species
n_neutral_species = run_info.n_neutral_species
Expand All @@ -150,20 +161,16 @@ function run_test(test_input, base, message, rtol, atol; tol_3V, kwargs...)
ppar_neutral_zrst = postproc_load_variable(run_info, "pz_neutral")
qpar_neutral_zrst = postproc_load_variable(run_info, "qz_neutral")
v_t_neutral_zrst = postproc_load_variable(run_info, "thermal_speed_neutral")
f_neutral_vzvrvzetazrst = postproc_load_variable(run_info, "f_neutral")
# Slice f_neutral while loading to save memory, and avoid termination of the
# 'long tests' CI job.
f_neutral_vzvrvzetazrst = postproc_load_variable(run_info, "f_neutral",
ivzeta=(vzeta.n+1)÷2,
ivr=(vr.n+1)÷2)
phi_zrt = postproc_load_variable(run_info, "phi")
Er_zrt = postproc_load_variable(run_info, "Er")
Ez_zrt = postproc_load_variable(run_info, "Ez")
z = run_info.z
z_spectral = run_info.z_spectral
vpa = run_info.vpa
vpa_spectral = run_info.vpa_spectral
vzeta = run_info.vzeta
vzeta_spectral = run_info.vzeta_spectral
vr = run_info.vr
vr_spectral = run_info.vr_spectral
vz = run_info.vz
vz_spectral = run_info.vz_spectral

close_run_info(run_info)

# Delete output because output files for 3V tests can be large
rm(joinpath(realpath(input["base_directory"]), name); recursive=true)
Expand All @@ -180,7 +187,7 @@ function run_test(test_input, base, message, rtol, atol; tol_3V, kwargs...)
ppar_neutral = ppar_neutral_zrst[:,1,:,:]
qpar_neutral = qpar_neutral_zrst[:,1,:,:]
v_t_neutral = v_t_neutral_zrst[:,1,:,:]
f_neutral = f_neutral_vzvrvzetazrst[:,(vr.n+1)÷2,(vzeta.n+1)÷2,:,1,:,:]
f_neutral = f_neutral_vzvrvzetazrst[:,:,1,:,:]

# Unnormalize f
if input["evolve_moments_density"]
Expand Down