Repository navigation
Merge main into feat/native_dopri - #250
Open
rogeriojorge wants to merge 3 commits into
Open
rogeriojorge wants to merge 3 commits into
rogeriojorge wants to merge 3 commits into
Conversation
…ith the curvature, as main
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges main into feat/native_dopri so that #187 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
_maskedand replaces a non-finite segment start by a finite one so no NaN reaches the derivative. Your branch routes the same code through_termsand_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_radialis a copy of that interpolation and did not follow, sotest_vmec_private_values_match_current_maindiffered by about 1e-6 at s = 0.99999. It now uses the same parabola.Checks, JAX_ENABLE_X64=1, pytest -n 2: tests/test_native_orbit.py 19 passed, tests/test_dynamics.py 116 passed.
Merging this into feat/native_dopri clears the conflict on #187.