Skip to content

Equilibrium - BUGFIX - Write gse.h5 and gsei.h5 when diagnose_src is set #522

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
StuartBenjamin wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Equilibrium - BUGFIX - Write gse.h5 and gsei.h5 when diagnose_src is set #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc037fc
Equilibrium - BUGFIX - Write gse.h5 and gsei.h5 when diagnose_src is set
StuartBenjamin Oct 12, 2026
5dfa356
Equilibrium - MINOR - Trim the gse.h5 test to the file check and the …
StuartBenjamin Oct 13, 2026
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
6 changes: 3 additions & 3 deletions src/Equilibrium/Equilibrium.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,8 +625,8 @@ function equilibrium_gse!(equil::PlasmaEquilibrium)
gse_data = Array{Float32,3}(undef, mpsi + 1, mtheta + 1, 7)
for ipsi in 0:mpsi
for itheta in 0:mtheta
gse_data[ipsi+1, itheta+1, 1] = Float32(flux.ys[itheta+1])
gse_data[ipsi+1, itheta+1, 2] = Float32(flux.xs[ipsi+1])
gse_data[ipsi+1, itheta+1, 1] = Float32(equil.rzphi_ys[itheta+1])
gse_data[ipsi+1, itheta+1, 2] = Float32(equil.rzphi_xs[ipsi+1])
gse_data[ipsi+1, itheta+1, 3] = Float32(flux_fs[ipsi+1, itheta+1, 1])
gse_data[ipsi+1, itheta+1, 4] = Float32(flux_fs[ipsi+1, itheta+1, 2])
gse_data[ipsi+1, itheta+1, 5] = Float32(source[ipsi+1, itheta+1])
Expand All @@ -639,7 +639,7 @@ function equilibrium_gse!(equil::PlasmaEquilibrium)

# Write integrated error criterion
h5open(joinpath(dirname(equil.config.eq_filename), "gsei.h5"), "w") do file
file["xs"] = Float32.(flux.xs)
file["xs"] = Float32.(equil.rzphi_xs)
file["term"] = Float32.(term)
file["totali"] = Float32.(totali)
file["errori"] = Float32.(errori)
Expand Down
15 changes: 15 additions & 0 deletions test/runtests_equil.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using HDF5

@testset "Equilibrium Unit Tests" begin

Expand Down Expand Up @@ -594,4 +595,18 @@
@test occursin("sol.retcode != ReturnCode.Success", src)
@test occursin("isapprox(sol.t[end], 2π", src)
end

@testset "equilibrium_gse! writes gse.h5 with diagnose_src" begin
dir = mktempdir()
cp(joinpath(data_dir, "EQDSK_COCOS_02"), joinpath(dir, "EQDSK_COCOS_02"))
config = GeneralizedPerturbedEquilibrium.Equilibrium.EquilibriumConfig(;
eq_filename=joinpath(dir, "EQDSK_COCOS_02"), eq_type="efit", jac_type="boozer",
grid_type="ldp", psilow=0.01, psihigh=0.994)
eq = GeneralizedPerturbedEquilibrium.Equilibrium.setup_equilibrium(config)
eq.params.diagnose_src = true
GeneralizedPerturbedEquilibrium.Equilibrium.equilibrium_gse!(eq)
@test all(isfile(joinpath(dir, f)) for f in ("gsec.h5", "gse.h5", "gsei.h5"))
# Column 2 is ψ, as plot_gse_by_theta reads it
@test h5read(joinpath(dir, "gse.h5"), "gse_data")[:, 1, 2] == Float32.(eq.rzphi_xs)
end
end
Loading