Skip to content

Update default DIIID-like equilibrium#176

Merged
logan-nc merged 5 commits intodevelopfrom
update_D3Dlike_equil
Mar 6, 2026
Merged

Update default DIIID-like equilibrium#176
logan-nc merged 5 commits intodevelopfrom
update_D3Dlike_equil

Conversation

@d-burg
Copy link
Collaborator

@d-burg d-burg commented Feb 27, 2026

This update adds the same .geqdsk file as used in the new GPEC PR at PrincetonUniversity/GPEC#245

Copilot AI review requested due to automatic review settings February 27, 2026 21:01
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the default DIII-D-like equilibrium input used by the example and benchmark configurations, aligning JPEC’s shipped inputs with the referenced GPEC update.

Changes:

  • Switch default eq_filename in the DIII-D-like example to TkMkr_D3Dlike_inexp=1.0.geqdsk.
  • Switch default eq_filename in the DIII-D benchmark config to the same updated EFIT g-file.

Reviewed changes

Copilot reviewed 2 out of 6 changed files in this pull request and generated no comments.

File Description
examples/DIIID-like_ideal_example/equil.toml Updates the example’s default EFIT g-file reference to the new DIII-D-like equilibrium.
benchmarks/DIIID_ideal_example/equil.toml Updates the benchmark’s default EFIT g-file reference to match the updated equilibrium input.

@logan-nc
Copy link
Collaborator

Thanks. Can we rename this to not have the inexp1.0? With no surrounding context, it will just confuse new users

@jhalpern30
Copy link
Collaborator

@d-burg FYI the equil.toml is deprecated now, everything's been consolidated into jpec.toml (that's why there's merge conflicts). So for this PR, you'll probably have to pull from develop and then update the new names of your EQs in the jpec.toml files instead.

@logan-nc
Copy link
Collaborator

logan-nc commented Mar 2, 2026

Yeah, you can even just ditch this branch. Branch from develop and then pull request to merge back into develop.

Please post an overplot of the equilibria summaries and comparison table of key parameters so we can see what changed and what stayed the same. Critically, please post a table comparing the stability of the example before and after the change. We have been quoting stability (et[1]) for the examples for all our PRs as proof that they didn't break things so its important to know if/how the numbers will be changed with this!

@logan-nc
Copy link
Collaborator

logan-nc commented Mar 6, 2026

Here is the overlay:
image

logan-nc and others added 3 commits March 6, 2026 16:00
@logan-nc
Copy link
Collaborator

logan-nc commented Mar 6, 2026

This branch:

┌ Info: 
│ ============================================================
│   JPEC - Julia Perturbed Equilibrium Code  [92b2f9d9]
└ ============================================================
┌ Info: 
│   Equilibrium
└ ----------------------------------------
[ Info: Forcing hamada coordinate jacobian exponents: power_*
[ Info: Processing EFIT g-file: examples/DIIID-like_ideal_example/TkMkr_D3Dlike_Hmode.geqdsk
[ Info: Parsed from header: nw=257, nh=257
[ Info: Magnetic axis found at R = 1.744, Z = -0.005
[ Info: Inboard separatrix found at R = 1.058
[ Info: Outboard separatrix found at R = 2.301
[ Info: Equilibrium construction completed in 2.825 s
┌ Info: 
│   Force-Free States
└ ----------------------------------------
[ Info: Setting psilim via dmlim: initial qlim = 5.426, dmlim = 0.200
[ Info: Evaluating Mercier criterion
┌ Info: Run parameters:
│    q0 = 1.210, qmin = 1.209, qmax = 5.426, q95 = 4.505
│    qlim = 5.200, psilim = 0.989
│    betat = 0.013, betan = -1.376, betap1 = 0.627
│    mlow =  -12, mhigh =   21, mpert =   34, mband =   33
└    nlow =    1, nhigh =    1, npert =    1
[ Info: Computing F, G, and K matrices
[ Info: Integrating Euler-Lagrange equation
[ Info:    ψ = 0.000,  q = 1.209
[ Info:    ψ = 0.620,  q = 2.000,  steps = 446
[ Info:    ψ = 0.811,  q = 3.000,  steps = 570
[ Info:    ψ = 0.909,  q = 4.000,  steps = 677
[ Info:    ψ = 0.983,  q = 5.000,  steps = 789
[ Info:    ψ = 0.989,  q = 5.200,  steps = 829
[ Info: Evaluating fixed-boundary stability criterion
┌ Warning: W inverse matrix was non-Hermitian beyond tolerance at 5 integration step(s)
└ @ JPEC.ForceFreeStates ~/Code/JPEC_main/src/ForceFreeStates/FixedBoundaryStability.jl:32
[ Info: Computing free boundary energies (no wall)
┌ Info: Least Stable Eigenmode Energies:
│   Plasma = -8.601e-01 +5.989e-05i
│   Vacuum = +2.071e+00 +1.750e-17i
└   Total  = +1.211e+00 +5.989e-05i
[ Info: All free-boundary modes stable for n = 1
[ Info: Results written to jpec.h5
[ Info: Force-Free States completed in 4.862 s

Develop branch:

┌ Info: 
│ ============================================================
│   JPEC - Julia Perturbed Equilibrium Code  [de61634b]
└ ============================================================
┌ Info: 
│   Equilibrium
└ ----------------------------------------
[ Info: Forcing hamada coordinate jacobian exponents: power_*
[ Info: Processing EFIT g-file: examples/DIIID-like_ideal_example/TKMKR_D3Dlike_default_Hmode.geqdsk
[ Info: Parsed from header: nw=257, nh=257
[ Info: Magnetic axis found at R = 1.743, Z = -0.006
[ Info: Inboard separatrix found at R = 1.058
[ Info: Outboard separatrix found at R = 2.301
[ Info: Equilibrium construction completed in 2.618 s
┌ Info: 
│   Force-Free States
└ ----------------------------------------
[ Info: Setting psilim via dmlim: initial qlim = 5.331, dmlim = 0.200
[ Info: Evaluating Mercier criterion
┌ Info: Run parameters:
│    q0 = 1.065, qmin = 1.065, qmax = 5.331, q95 = 4.292
│    qlim = 5.200, psilim = 0.991
│    betat = 0.013, betan = -1.368, betap1 = 0.612
│    mlow =  -12, mhigh =   21, mpert =   34, mband =   33
└    nlow =    1, nhigh =    1, npert =    1
[ Info: Computing F, G, and K matrices
[ Info: Integrating Euler-Lagrange equation
[ Info:    ψ = 0.000,  q = 1.065
[ Info:    ψ = 0.551,  q = 2.000,  steps = 441
[ Info:    ψ = 0.811,  q = 3.000,  steps = 593
[ Info:    ψ = 0.926,  q = 4.000,  steps = 705
[ Info:    ψ = 0.986,  q = 5.000,  steps = 810
[ Info:    ψ = 0.991,  q = 5.200,  steps = 849
[ Info: Evaluating fixed-boundary stability criterion
┌ Warning: W inverse matrix was non-Hermitian beyond tolerance at 3 integration step(s)
└ @ JPEC.ForceFreeStates ~/Code/JPEC_tmp/src/ForceFreeStates/FixedBoundaryStability.jl:32
[ Info: Computing free boundary energies (no wall)
┌ Info: Least Stable Eigenmode Energies:
│   Plasma = -3.471e-02 +1.911e-05i
│   Vacuum = +1.742e+00 -1.801e-16i
└   Total  = +1.707e+00 +1.911e-05i
[ Info: All free-boundary modes stable for n = 1
[ Info: Results written to jpec.h5
[ Info: Force-Free States completed in 26.151 s

@logan-nc logan-nc added the documentation Improvements or additions to documentation label Mar 6, 2026
@logan-nc logan-nc merged commit 6655d6c into develop Mar 6, 2026
3 checks passed
@logan-nc logan-nc deleted the update_D3Dlike_equil branch March 6, 2026 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants