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

Use max rho of surface to compute A(z) #1086

Merged
merged 10 commits into from
Jul 3, 2024
Merged

Use max rho of surface to compute A(z) #1086

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0e72363
Use max rho of surface to compute A(z)
unalmis Jun 28, 2024
6c8f81c
Genearlize A(z) for nonzero omega
unalmis Jun 28, 2024
a16afb7
Update comment
unalmis Jun 28, 2024
95d94b3
Update math comment in A(z)
unalmis Jun 28, 2024
44e03d1
Update math comment in A(z)
unalmis Jun 28, 2024
cc01bce
Use data["rho"] instead of getting grid
unalmis Jul 1, 2024
55313ed
Scale area by 1/rho^2 to approximate area on LCFS and update descript…
unalmis Jul 3, 2024
5a63f1d
Merge branch 'master' into A(z)
unalmis Jul 3, 2024
9266c10
Fix label in basis vector description
unalmis Jul 3, 2024
5c3d5f0
Add clarification to description of perimter(z) and area(z)
unalmis Jul 3, 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
4 changes: 2 additions & 2 deletions desc/compute/_geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def _A_of_z(params, transforms, profiles, data, **kwargs):
label="A(\\zeta)",
units="m^{2}",
units_long="square meters",
description="Cross-sectional area as function of zeta",
description="Enclosed cross-sectional area as function of zeta",
dim=1,
params=[],
transforms={"grid": []},
Expand All @@ -196,7 +196,7 @@ def _A_of_z_FourierRZToroidalSurface(params, transforms, profiles, data, **kwarg
transforms["grid"],
data["Z"] * n[:, 2] * jnp.sqrt(data["g_tt"]),
line_label="theta",
fix_surface=("rho", 1.0),
unalmis marked this conversation as resolved.
Show resolved Hide resolved
fix_surface=("rho", jnp.max(transforms["grid"].nodes[:, 0])),
expand_out=True,
)
)
Expand Down
Loading