Skip to content
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.

Sign up for GitHub

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

Jump to bottom

ko/test coils #1025

Closed
wants to merge 85 commits into from
Closed

ko/test coils #1025

wants to merge 85 commits into from

Conversation

kianorr
Copy link
Collaborator

@kianorr kianorr commented May 20, 2024 •
edited
Loading

resolves #1021

kianorr and others added 30 commits March 7, 2024 11:58
@kianorr
initial commit
744f6f2
@kianorr
stuff
5bfe0f3
@kianorr
add discontinuous knots to SplineXYZCurve
28da0aa 
- also added to compute function for each interval
- didn't add for all compute functions yet
@kianorr
Merge branch 'master' into ko/discon_curve
7d45502
@kianorr
fixed taking slices of knots
18a8e15 
- added equal signs to ranges
- used jnp.where instead of directly slicing
@kianorr
Merge branch 'ko/discon_curve' of https://github.com/PlasmaControl/DESC…
4568169 
… into ko/discon_curve
@kianorr
Merge branch 'master' into ko/discon_curve
3300c6a
@kianorr
correctly get intervals
2ba7f7d 
- now works for batch arrays
- interpolate over whole array
@dpanici
Merge branch 'master' into ko/discon_curve
398b6bf
@kianorr
use indices instead of knots for user input
7639ed8
@dpanici
Merge branch 'master' into ko/discon_curve
7896a56
@kianorr
Merge branch 'ko/discon_curve' of https://github.com/PlasmaControl/DESC…
e281fae 
… into ko/discon_curve
@kianorr
address reviews
b07d62a 
- use ifor_loop
- delete double stack
- use jnp.where for istop
@kianorr
separate interpolation cases
8392252 
- add is_discontinuous
- use [[]] as default indices
@kianorr
make body simpler
6e4b742
@kianorr
add discontinuous to x_s
b7973de
@kianorr
add x_ss and x_sss
958c299
@kianorr
delete shift where unnecessary
4db806f
@kianorr
Merge branch 'master' into ko/discon_curve
0ba9a21
@kianorr
refactor some things in x
3874f04 
- still have to do it for the others
@kianorr
add actual test
79af9d5
@kianorr
Merge branch 'ko/discon_curve' of https://github.com/PlasmaControl/DESC…
2c8c5a8 
… into ko/discon_curve
@kianorr
refactor (maybe too much?)
fdf3e3d
@kianorr
refactor compute func for x
be47fdc
@kianorr
apply refactor to derivatives
20bffd7
@dpanici
Merge branch 'master' into ko/discon_curve
331c61e
@kianorr
add discontinuous_indices to from_values and to_SplineXYZ
7373aea
@kianorr
move inner funcs outside compute funcs
d2901d6
@kianorr
Merge branch 'master' into ko/discon_curve
bf6d6a8
@kianorr
get method from compute func in Curve
19f3bef
@ddudt
Copy link
Collaborator

ddudt commented Jun 13, 2024

See if these new tests pass with the changes from PR #1030 on branch dd/hotfix. Let's make sure we have at least one test where a coilset is saved, loaded, and then re-optimized (that was the underlying problem in Issue #1029).

kianorr and others added 2 commits June 16, 2024 14:37
@kianorr
Merge branch 'master' into ko/discon_curve
4f7be20
@kianorr
use DummyCoilSet and DummyMixedCoilSet
70908d8 
I guess I didn't try if it worked without loading but it does
@kianorr
Copy link
Collaborator Author

kianorr commented Jun 17, 2024

See if these new tests pass with the changes from PR #1030 on branch dd/hotfix. Let's make sure we have at least one test where a coilset is saved, loaded, and then re-optimized (that was the underlying problem in Issue #1029).

So should I have one of the dummy coil sets to load/save and then the other would just return the coil set? Or should both DummyCoilSet and DummyMixedCoilSet save/load the coil set?

@ddudt ddudt mentioned this pull request Jun 24, 2024
Merged
@f0uriest f0uriest changed the base branch from ko/discon_curve to master June 26, 2024 19:02
@dpanici
Copy link
Collaborator

dpanici commented Jun 26, 2024

Close this probably and open a new PR (and one for method fix PR)

@dpanici
Copy link
Collaborator

dpanici commented Jul 1, 2024

Also, try to test PlasmaCoilsetMinDistance as well as QuadraticFlux for each coil type

@f0uriest f0uriest mentioned this pull request Jul 3, 2024
Merged
@kianorr kianorr mentioned this pull request Jul 4, 2024
Merged
@kianorr kianorr closed this Jul 4, 2024
@kianorr
Copy link
Collaborator Author

kianorr commented Jul 4, 2024

PR #1099 replaced this one

@kianorr kianorr deleted the ko/test_coils branch July 4, 2024 20:31
@kianorr kianorr mentioned this pull request Jul 4, 2024
Closed
5 tasks
kianorr added a commit that referenced this pull request Jul 9, 2024
@kianorr
Ko/test coil opt (#1099)
faabaed 
Test every coil type. Resolves #1021 

Also contains bug fixes:
- fixes bug when computing magnetic field with `FourierRZcoil` that has
`NFP>1`, previously the grid used had the same `NFP` but that meant that
only part of the coil was being included in the biot savart integral.
Now grids for magnetic field computation from `FourierRZCoil` have
`NFP=1` and have `NFP` multiplying the usual default grid resolution to
avoid this issue

Replaces PR #1025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dpanici dpanici dpanici left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add test to Check that we can optimize with every coil type
3 participants
@kianorr @dpanici @ddudt