Skip to content

perf: use IMAS.trace_simple_surfaces to improve performance #11

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

Open
mgyoo86 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

perf: use IMAS.trace_simple_surfaces to improve performance #11

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b8a21c
perf: use simpler IMAS trace function to reduce memory allocations
mgyoo86 Oct 21, 2025
128b4ff
remove temporary convenience dispatch for `IMAS.trace_simple_surfaces`
mgyoo86 Oct 25, 2025
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
19 changes: 14 additions & 5 deletions src/PAM.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ mutable struct AllocationPool{T<:Real}
nsource_max_len::Int
end

function AllocationPool(::Type{T}, surfaces::Vector{IMAS.FluxSurface}) where {T<:Real}
function AllocationPool(::Type{T}, surfaces::Vector{<:IMAS.AbstractFluxSurface}) where {T<:Real}
max_len = maximum(length(surf.r) for surf in surfaces)
return AllocationPool{T}(Vector{T}(undef, max_len), max_len)
end
Expand Down Expand Up @@ -58,7 +58,7 @@ function Pellet(
eqt::IMAS.equilibrium__time_slice,
cp1d::IMAS.core_profiles__profiles_1d,
time::Vector{Float64},
surfaces::Vector{IMAS.FluxSurface},
surfaces::Vector{<:IMAS.AbstractFluxSurface},
drift_model::Symbol,
Bt_dependance::Bool,
update_plasma::Bool
Expand Down Expand Up @@ -555,7 +555,7 @@ function dr_dt!(pelt::Pellet, k::Int)
return
end

function pellet_density(pelt::Pellet, surface::IMAS.FluxSurface, k::Int)
function pellet_density(pelt::Pellet, surface::IMAS.AbstractFluxSurface, k::Int)
# Get buffer view from pool
len = length(surface.r)
nsource = @view pelt.pool.nsource_buffer[1:len]
Expand Down Expand Up @@ -583,7 +583,7 @@ function pellet_density(pelt::Pellet, surface::IMAS.FluxSurface, k::Int)
return IMAS.flux_surface_avg(nsource, surface)
end

function ablate!(eqt::IMAS.equilibrium__time_slice, cp1d::IMAS.core_profiles__profiles_1d, pelt::Pellet, surfaces::Vector{IMAS.FluxSurface})
function ablate!(eqt::IMAS.equilibrium__time_slice, cp1d::IMAS.core_profiles__profiles_1d, pelt::Pellet, surfaces::Vector{<:IMAS.AbstractFluxSurface})
pellet_source = zeros(length(pelt.time), length(surfaces))

for k in 2:length(pelt.time)
Expand Down Expand Up @@ -659,6 +659,15 @@ end
end
end

# Convenient dispatch to call IMAS's trace_simple_surfaces
function IMAS.trace_simple_surfaces(eqt::IMAS.equilibrium__time_slice{T}, wall_r::AbstractVector{T}, wall_z::AbstractVector{T}) where {T<:Real}
Comment thread
mgyoo86 marked this conversation as resolved.
Outdated
eqt2d = findfirst(:rectangular, eqt.profiles_2d)
r, z, PSI_interpolant = IMAS.ψ_interpolant(eqt2d)
RA = eqt.global_quantities.magnetic_axis.r
ZA = eqt.global_quantities.magnetic_axis.z
return IMAS.trace_simple_surfaces(eqt.profiles_1d.psi, r, z, eqt2d.psi, PSI_interpolant, RA, ZA, wall_r, wall_z)
end

"""
run_PAM(dd::IMAS.dd; t_start::Float64, t_finish::Float64, time_step::Float64, drift_model::Symbol, Bt_dependance::Bool, update_plasma::Bool)

Expand All @@ -672,7 +681,7 @@ function run_PAM(dd::IMAS.dd; t_start::Float64, t_finish::Float64, time_step::Fl
time = collect(range(t_start, t_finish; step=time_step))

# define flux surfaces, will be needed for the pellet source calculations
surfaces = IMAS.trace_surfaces(eqt, IMAS.first_wall(dd.wall)...)
surfaces = IMAS.trace_simple_surfaces(eqt, IMAS.first_wall(dd.wall)...)

# initialize the pellet structure
pellet = Pellet(dd.pellets.time_slice[].pellet[1], eqt, cp1d, time, surfaces, drift_model, Bt_dependance, update_plasma)
Expand Down