Skip to content

Zeff profile support - #296

Open
StuartBenjamin wants to merge 13 commits into
developfrom
Zeff_profile_support
Open

StuartBenjamin wants to merge 13 commits into
developfrom
Zeff_profile_support

Conversation

@StuartBenjamin

@StuartBenjamin StuartBenjamin commented Oct 6, 2026 •

Copy link
Copy Markdown
Collaborator

GPEC PR report: Zeff_profile_support → develop

Builds on PR #295 !!

Branch tip: 99378252. My forked branch origin/Zeff_profile_support (57246273) plus two merge commits: develop (0b4a7720) and bugfix/dcon-vacuum-theta-frame (99378252).

What the PR adds

  • RDCON reads a Zeff profile. The new &RDCON_CONTROL arrays are psi_N_Zeff and Zeff, read with the new read_var_len routine (at most 1000 points). RDCON fits them with a spline in mercier.f and writes them to the rdcon netcdf. RDCON stops if MRE_flag is set but no Zeff profile was given.
  • MRE_flag and geom_flag now default to off (57246273).

Merge of develop (2026-10-06)

  • git merge origin/develop (5be646f2, 47 commits) merged cleanly with no conflicts. Nothing under equil/ changed.
  • develop replaces the g147131 inputs in the DIIID examples with TkMkr_D3Dlike_Hmode.geqdsk and .gpeckf.

Merge of bugfix/dcon-vacuum-theta-frame (2026-10-06, user request)

  • origin/bugfix/dcon-vacuum-theta-frame (J. Halpern, 3 commits) puts the vacuum matrix and its norm in the plasma's Fourier frame in DCON, RDCON and STRIDE (free.f). It merged cleanly.
  • Rebuilt into submodules/GPEC/bin; TPS run_tests.py passes 7/7.

Verification

  • GPEC build (TPS build script, --remake-gpec): passes. The install tests pass, apart from a5_tearing STRIDE, which is a known failure that does not block.
  • Build quirk, not caused by this PR. install/TARGETS.inc regenerates */version.inc only when the file is missing, so a rebuild in an existing tree reports the old git describe. Delete */version.inc before rebuilding.

StuartBenjamin and others added 13 commits June 21, 2026 21:12
…explitcit indexing control to match Zeff spline assignment
…r frame

VACUUM runs on a theta-reversed boundary, so wv comes back complex-conjugated
relative to wp; conjugate it after mscvac (free_run and free_wvmats). The
eigenvector norm used jmat(jpert-ipert), the transpose of the plasma-matrix
index order; use jmat(ipert-jpert). Up-down symmetric cases are unchanged;
asymmetric ones no longer depend on the theta origin.
…er frame

Same change as DCON: conjugate wv after mscvac (free_run and
free_get_wvac, used by the Galerkin solve) and transpose the norm.
…ier frame

STRIDE called mscvac with complex_flag false, keeping only Re(wv), which is
itself origin-dependent. Keep the full matrix, conjugate it as in DCON, and
transpose the norm.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants