Skip to content

Fix incorrect ion mass in total source and total flux #284

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

Merged
bclyons12 merged 1 commit into from
Nov 13, 2025
Merged

Fix incorrect ion mass in total source and total flux #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/physics/fluxsurfaces.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@ function find_magnetic_axis(
PSI_interpolant(x[1], x[2]) * psi_sign
catch e
if isa(e, InterruptException)
retrhow(e)
rethrow(e)
elseif typeof(e) <: BoundsError
return T2(Inf)
else
Expand Down Expand Up @@ -2310,7 +2310,7 @@ function luce_squareness(
push!(z, (norm(PD .- PO) - norm(PC .- PO)) / norm(PE .- PC))
catch e
if isa(e, InterruptException)
retrhow(e)
rethrow(e)
else
push!(z, T(0.0))
end
Expand Down
4 changes: 2 additions & 2 deletions src/physics/sources.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,13 +444,13 @@ function total_sources!(

# initialize ions (get list of ions by looking both under core_profiles and core_sources)
for ion in cp1d.ion
resize!(total_source1d.ion, "element[1].a" => ion.element[1].z_n, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false)
resize!(total_source1d.ion, "element[1].a" => ion.element[1].a, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false)
end
for source in core_sources.source
if !isempty(source.profiles_1d) && source.profiles_1d[1].time <= time0
source1d = source.profiles_1d[1]
for ion in source1d.ion
resize!(total_source1d.ion, "element[1].a" => ion.element[1].z_n, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false)
resize!(total_source1d.ion, "element[1].a" => ion.element[1].a, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false)
end
end
end
Expand Down
6 changes: 3 additions & 3 deletions src/physics/transport.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ function total_fluxes!(

# initialize ions
for ion in cp1d.ion
resize!(total_flux1d.ion, "element[1].a" => ion.element[1].z_n, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false)
resize!(total_flux1d.ion, "element[1].a" => ion.element[1].a, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false)
end
for model in core_transport.model
if !isempty(model.profiles_1d) && time0 >= model.profiles_1d[1].time
model1d = model.profiles_1d[time0]
for ion in model1d.ion
resize!(total_flux1d.ion, "element[1].a" => ion.element[1].z_n, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false)
resize!(total_flux1d.ion, "element[1].a" => ion.element[1].a, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false)
end
end
end
Expand Down Expand Up @@ -193,7 +193,7 @@ function total_fluxes!(
goto(m1d, path)
catch e
if isa(e, InterruptException)
retrhow(e)
rethrow(e)
else
continue
end
Expand Down