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

fourier bounce #1119

Open
wants to merge 64 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
d5b231e
Merge branch 'master' into ku/fourier_bounce
unalmis Aug 27, 2024
8d8aa78
MANUAL Merge branch 'bounce' into ku/fourier_bounce
unalmis Aug 28, 2024
a0e31ce
Fix missed things with manual merge in commit 8d8aa78
unalmis Aug 28, 2024
4d469e8
Merge branch 'master' into ku/fourier_bounce
unalmis Sep 16, 2024
dbd80a5
Reviving fourier bounce pull request
unalmis Sep 17, 2024
29fa913
Progressing
unalmis Sep 18, 2024
fa12723
Isolated issue of fourier series convergence to modding of theta by 2pi
unalmis Sep 18, 2024
5d93b3c
Merge branch 'master' into ku/fourier_bounce
unalmis Sep 18, 2024
e4f68b7
Update desc_from_clebsch function
unalmis Sep 18, 2024
fe60029
Merge branch 'master' into ku/fourier_bounce
unalmis Sep 18, 2024
a1fad7e
Merge branch 'ku/stop_angle_mod' into ku/fourier_bounce
unalmis Sep 19, 2024
7113d3f
Debugging cusp
unalmis Sep 19, 2024
0b14c20
document something that should be testd more
unalmis Sep 19, 2024
6c14202
Note that more poloidal resolution is needed
unalmis Sep 19, 2024
be0aa6b
Merge branch 'master' into ku/fourier_bounce
unalmis Sep 19, 2024
c348378
fix test
unalmis Sep 19, 2024
258dad0
-----
unalmis Sep 19, 2024
22df224
Document solution to discontinuity
unalmis Sep 19, 2024
2781681
Fix comment
unalmis Sep 19, 2024
41d440a
Remove unnecessary interpolation:
unalmis Sep 21, 2024
a5c87a4
Doing stuff marked todo
unalmis Sep 21, 2024
4eb6db2
testing
unalmis Sep 21, 2024
87dc90d
Improving API to avoid redundant computation
unalmis Sep 22, 2024
142c13c
Merge branch 'ku/fourier_bounce_part1' into ku/fourier_bounce
unalmis Sep 22, 2024
1d5a84d
Merge branch 'ku/fourier_bounce_part1' into ku/fourier_bounce
unalmis Sep 22, 2024
7977695
Document choice for quadrature
unalmis Sep 22, 2024
fe3d7b4
Merge branch 'ku/fourier_bounce_part1' into ku/fourier_bounce
unalmis Sep 22, 2024
53ca834
More documentation
unalmis Sep 22, 2024
679697f
Document multivaluedness bug and how to fix. likely will be done in n…
unalmis Sep 24, 2024
dfb3eee
Merge branch 'ku/fourier_bounce_part1' into ku/fourier_bounce
unalmis Sep 24, 2024
b270de8
Merge branch 'master' into ku/fourier_bounce
unalmis Sep 24, 2024
38e71e9
Marking test xfail
unalmis Sep 25, 2024
05cb195
Adding more tests and documentation
unalmis Sep 25, 2024
ff2d204
Merge branch 'master' into ku/fourier_bounce
unalmis Sep 26, 2024
134d826
short-circuit convergence of poloidal Fourier series
unalmis Sep 26, 2024
455353f
Remove resolved comment
unalmis Sep 26, 2024
f63f3b3
Stitch theta as well for robustness
unalmis Sep 26, 2024
19e6bd1
Merge branch 'master' into ku/fourier_bounce
unalmis Sep 27, 2024
b1de0d6
Solved the convergence issue
unalmis Sep 27, 2024
e028106
support vector valued to simplify multivalued function reconstruction
unalmis Sep 27, 2024
2ce57ee
Fix comment
unalmis Sep 27, 2024
32fcdb2
Merge branch 'master' into ku/fourier_bounce
unalmis Sep 29, 2024
7b1267a
Add explanation of math in c
unalmis Sep 29, 2024
47988d1
small but important typo in comment
unalmis Sep 29, 2024
f78d7bd
Merge branch 'master' into ku/fourier_bounce
unalmis Sep 30, 2024
ea227a1
Genealize to NFP!=1
unalmis Oct 2, 2024
18af538
Merge branch 'master' into ku/fourier_bounce
unalmis Oct 2, 2024
89762c7
Add NFP to get_rtz_grid
unalmis Oct 2, 2024
c3e465b
More NFP fixes
unalmis Oct 2, 2024
3871353
Got things working now
unalmis Oct 3, 2024
a5cf4bc
Merge branch 'master' into ku/fourier_bounce
unalmis Oct 3, 2024
60fc00f
Change NFP mismatch error back to warning
unalmis Oct 3, 2024
08b54af
Merge branch 'master' into ku/fourier_bounce
unalmis Oct 6, 2024
56dcbb2
Split compute quantities into periodic and secular terms
unalmis Oct 6, 2024
30d511e
Add ability to compute length along field line with fft
unalmis Oct 6, 2024
6870bcd
Make sure returned shape doesn't have extra dimension
unalmis Oct 6, 2024
5e72593
PUlling changes from downstream branch
unalmis Oct 6, 2024
ce64c53
Add missing key to stability fun test
unalmis Oct 6, 2024
7c88211
Document algorithm choices
unalmis Oct 6, 2024
1376e90
Update incorrect comment
unalmis Oct 6, 2024
d54a809
document better root finding method for later
unalmis Oct 7, 2024
8cef6d3
update ballooning notebook by explicitly comping gbdrift
unalmis Oct 7, 2024
0e07215
resolving jit error
unalmis Oct 7, 2024
47962de
Merge branch 'master' into ku/fourier_bounce
YigitElma Oct 12, 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: 3 additions & 1 deletion desc/grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -1037,8 +1037,10 @@ def _create_nodes( # noqa: C901
"""
self._NFP = check_posint(NFP, "NFP", False)
self._period = (np.inf, 2 * np.pi, 2 * np.pi / self._NFP)
# TODO:
# FIXME:
# https://github.com/PlasmaControl/DESC/pull/1204#pullrequestreview-2246771337
# Quantities like alpha, grad(alpha), etc. are computed incorrectly at
# phi > 2pi / NFP and theta > 2pi / NFP.
axis = bool(axis)
endpoint = bool(endpoint)
theta_period = self.period[1]
Expand Down
2 changes: 1 addition & 1 deletion desc/integrals/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Classes for function integration."""

from .bounce_integral import Bounce1D
from .bounce_integral import Bounce1D, Bounce2D
from .singularities import (
DFTInterpolator,
FFTInterpolator,
Expand Down
Loading
Loading