Small fixes to enable grids with nonorthogonal X-point but orthogonal targets #180
Conversation
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
Collaborator
Author
|
If this is useful, could somebody document it in the manual please? @mikekryjak? |
These variables are not always defined, so skip to avoid unhelpful error.
johnomotani
force-pushed
the
nonorthogonal-Xpoint
branch
from
ef1491d to
d802e50
Compare
Collaborator
Author
|
Also, once this works we should probably add an integrated test to make sure it doesn't get broken. |
This allows the 'orthogonal' Sfunc to do something sensible at the targets when it is being used there because only the X-point is 'nonorthogonal'.
johnomotani
force-pushed
the
nonorthogonal-Xpoint
branch
from
88ef53a to
72f6900
Compare
Horrible hack to allow sfunc_orthogonal to be used for the grid point spacing at/beyond the target. The initial attempt at this broke the default nonorthogonal grid, as in that case sfunc_orthogonal should not extrapolate.
johnomotani
force-pushed
the
nonorthogonal-Xpoint
branch
from
72f6900 to
8172f64
Compare
johnomotani
force-pushed
the
nonorthogonal-Xpoint
branch
from
972a9db to
fdd66f6
Compare
Collaborator
Author
|
I think this is merge-able now if someone wants to review. Tests are still missing, but tests for this and a few other 'experimental' features could be left as an open issue for now, until someone has time to look into that. |
This was referenced Aug 21, 2025
Collaborator
Author
|
I think the 'utilities' test is failing because xBOUT made a new release, but #192 hasn't been merged yet. So should be fine to ignore that and get on with merging all the completed PRs... |
bendudson
approved these changes
Aug 27, 2025
Contributor
bendudson
left a comment
bendudson
left a comment
There was a problem hiding this comment.
Thanks, @johnomotani !
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.
To generate grids with a nonorthogonal X-point but orthogonal targets, set
orthogonal = False, andnonorthogonal_target_all_poloidal_spacing_range = None(ornullin a YAML input file). The othernonorthogonal_target_*_poloidal_spacing_rangesettings should also be set toNone, which is the default as long as they are not set explicitly.doc/whats-new.mdwith a summary of the changes