-
Notifications
You must be signed in to change notification settings - Fork 2
Add 3d ray intersect #269
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
AreWeDreaming
wants to merge
14
commits into
master
Choose a base branch
from
add_3d_ray_intersect
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add 3d ray intersect #269
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
99251b1
This adds a routine for ray intersection with a torus
AreWeDreaming 5f45534
Merge remote-tracking branch 'origin/master' into add_3d_ray_intersect
AreWeDreaming 2115990
Sneak in little addition for new source
AreWeDreaming 4fd08d1
Add tests and fix bugs
AreWeDreaming 4d6516f
Merge branch 'master' into add_3d_ray_intersect
AreWeDreaming da464d5
Remove uneeded, untested routine
AreWeDreaming 756f013
Merge branch 'master' into add_3d_ray_intersect
AreWeDreaming eb2edce
Make sure geometry tests are run
AreWeDreaming 544e4ac
Welp theere goes my contribution
AreWeDreaming ef97206
Fix accidental deletion when merging
AreWeDreaming 91a5b95
Wrong spot
AreWeDreaming 14f7d46
Remove cruft
AreWeDreaming 381cc89
Update src/physics/particles.jl
AreWeDreaming 6195ab4
Merge branch 'master' into add_3d_ray_intersect
AreWeDreaming File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
using IMAS | ||
using Test | ||
@testset "Test toroical_intersection" begin | ||
test_cases = [ | ||
([1.0, 4.0, 4.0, 1.0, 1.0], [-1.0, -1.0, 1.0, 1.0, -1.0], [6.0, 0.0, 0.0], [-1.0, 0.0, 0.0], [4.0,0.0,0.0]) | ||
] | ||
for (r_box, z_box, origin, direction, expected) in test_cases | ||
@testset "origin=$origin, direction=$direction, r_box=$r_box, z_box=$z_box" begin | ||
# println("--- x0=$x0, y0=$y0, dx=$dx, dy=$dy, r_min=$r_min, r_max=$r_max ---") | ||
t = IMAS.toroidal_intersection(r_box, z_box, origin, direction) | ||
test_result = origin .+ direction .* t | ||
println("--- Result | expected: $test_result | $expected ---") | ||
@test test_result ≈ expected | ||
end | ||
end | ||
end |
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
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.
Uh oh!
There was an error while loading. Please reload this page.