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.

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

Rc/toroidal angle #568

Draft
wants to merge 24 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
928e284
Merge branch 'master' into rc/toroidal_angle
f0uriest Jun 27, 2023
de22aad
Merge branch 'rc/optimize_axis' into rc/toroidal_angle
f0uriest Jul 5, 2023
aa2463c
Merge branch 'master' into rc/toroidal_angle
f0uriest Jul 6, 2023
9ee656f
Add toroidal stream function to FourierRZCurve
f0uriest Jul 6, 2023
41dfc68
Add set_up method to FourierRZToroidalSurface for toroidal stream fun…
f0uriest Jul 6, 2023
795373d
Add constraint to fix phi==zeta
f0uriest Jul 6, 2023
0c24e7f
Add constraints for axis W and self consistency
f0uriest Jul 6, 2023
24a0415
Merge branch 'master' into rc/toroidal_angle
f0uriest Jul 7, 2023
97c320b
Fix missing args when creating axis from configuration
f0uriest Jul 7, 2023
e21069c
Misc cleanup of new objectives
f0uriest Jul 7, 2023
4c0e914
Update call to map_coordinates in plotting
f0uriest Jul 7, 2023
0fc7a58
Convert vectors to xyz basis before finite differencing
f0uriest Jul 13, 2023
5766511
Fix boundary conditions on 2d finite differencing
f0uriest Jul 13, 2023
4727aea
Merge branch 'master' into rc/toroidal_angle
f0uriest Jul 15, 2023
70ead4b
Update coordinate test util to handle new toroidal angle
f0uriest Jul 15, 2023
52d5330
Ensure phi is in [0,2pi)
f0uriest Jul 15, 2023
598ca2a
Add axis W terms to perturbations
f0uriest Jul 15, 2023
f60f5aa
Merge branch 'master' into rc/toroidal_angle
f0uriest Feb 23, 2024
6a3655a
More misc fixes after rebasing against master
f0uriest Feb 23, 2024
80f1177
Update example equilibria
f0uriest Feb 23, 2024
f108257
Merge branch 'master' into rc/toroidal_angle
f0uriest Feb 23, 2024
4cfdfb7
Merge branch 'master' into rc/toroidal_angle
dpanici Aug 20, 2024
c584fd7
Merge branch 'master' into rc/toroidal_angle
unalmis Aug 21, 2024
b3f4fc4
Merge branch 'master' into rc/toroidal_angle
dpanici Aug 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions desc/coils.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,13 +420,15 @@ class FourierRZCoil(_Coil, FourierRZCurve):
Parameters
----------
current : float
Current through the coil, in Amperes.
R_n, Z_n: array-like
fourier coefficients for R, Z
current through coil, in Amperes
R_n, Z_n, W_n: array-like
fourier coefficients for R, Z, omega
modes_R : array-like
mode numbers associated with R_n. If not given defaults to [-n:n]
modes_Z : array-like
mode numbers associated with Z_n, defaults to modes_R
modes_W : array-like
mode numbers associated with W_n, defaults to modes_W
NFP : int
number of field periods
sym : bool
Expand Down Expand Up @@ -473,13 +475,17 @@ def __init__(
current=1,
R_n=10,
Z_n=0,
W_n=0,
modes_R=None,
modes_Z=None,
modes_W=None,
NFP=1,
sym="auto",
name="",
):
super().__init__(current, R_n, Z_n, modes_R, modes_Z, NFP, sym, name)
super().__init__(
current, R_n, Z_n, W_n, modes_R, modes_Z, modes_W, NFP, sym, name
)

@classmethod
def from_values(cls, current, coords, N=10, NFP=1, basis="rpz", sym=False, name=""):
Expand Down
Loading
Loading