Skip to content

Merge main into feat/native_split_collisions - #251

Open
rogeriojorge wants to merge 2 commits into
feat/native_split_collisionsfrom
merge-main/native-split-collisions
Open

rogeriojorge wants to merge 2 commits into
feat/native_split_collisionsfrom
merge-main/native-split-collisions

Conversation

@rogeriojorge

Copy link
Copy Markdown
Member

Merges main into feat/native_split_collisions so that #189 no longer conflicts.

Conflict in essos/dynamics.py, in the exterior-segment term and the segment solve. Main now wraps the exterior guiding-center field in _masked and replaces a non-finite segment start by a finite one so no NaN reaches the derivative. Your branch routes the same code through _terms and _solve(exterior=..., flag=...). I kept your structure and added both changes to it.

essos/rk.py: main now continues the VMEC radial interpolation past the last half-grid point with a parabola (end value, slope and curvature of the cubic). _vmec_radial is a copy of that interpolation and did not follow, so it now uses the same parabola.

Checks, JAX_ENABLE_X64=1, pytest -n 2: tests/test_native_orbit.py, tests/test_native_split.py and tests/test_dynamics.py, 154 passed.

Merging this into feat/native_split_collisions clears the conflict on #189.

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.

1 participant