Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
219 commits
Select commit Hold shift + click to select a range
45693b9
Merge changes from 1360
unalmis Jul 29, 2025
479c497
Add NFP warning to eq.compute
unalmis Jul 30, 2025
7181f79
Merge branch 'ku/NFP' into ku/partialsum
unalmis Jul 30, 2025
a85895a
first pass at partial sum
unalmis Jul 30, 2025
c390d07
Merge branch 'master' into ku/partialsum
unalmis Jul 30, 2025
c2a0e09
working commit
unalmis Jul 31, 2025
c12c884
Merge branch 'master' into ku/partialsum
unalmis Jul 31, 2025
9e87fd1
Remove old static attributes
unalmis Jul 31, 2025
3151bc7
partial sum pass two
unalmis Jul 31, 2025
c1cab79
Reduce resolution
unalmis Jul 31, 2025
7dc7916
Updated notebook
unalmis Jul 31, 2025
1bef805
Dummy wrapper to avoid circular import
unalmis Jul 31, 2025
f22e7d4
Update _fast_ion.py
unalmis Jul 31, 2025
39d1912
Cast to array first
unalmis Jul 31, 2025
8558e89
Remove deprecated code
unalmis Jul 31, 2025
b3a872c
Merge branch 'master' into ku/partialsum
unalmis Aug 2, 2025
c95b6ab
Add tests for NUFFTS
unalmis Aug 3, 2025
0062d6a
Add nuft2 vectorized
unalmis Aug 4, 2025
b961570
Merge branch 'master' into ku/partialsum
unalmis Aug 4, 2025
48fe226
Add tests for rfft2 to nufft transform
unalmis Aug 5, 2025
4344e6f
Merge branch 'ku/partialsum' into ku/nufft
unalmis Aug 5, 2025
66a48c2
Update changelog
unalmis Aug 5, 2025
b52ad96
Add failing test to show nufft developers
unalmis Aug 5, 2025
e9cad5d
Resolve some todos
unalmis Aug 6, 2025
f2853be
Fix typo in comment
unalmis Aug 6, 2025
546aee6
Update root-finding
unalmis Aug 6, 2025
c985023
Pull changes from ku/nufft
unalmis Aug 6, 2025
e9e4cd3
Merge branch 'ku/partialsum' into ku/nufft
unalmis Aug 6, 2025
64511a7
Remove comments
unalmis Aug 6, 2025
5543fe9
use partial summation approach in bounce2d.compute_theta
unalmis Aug 6, 2025
bdd174a
Merge branch 'master' into ku/partialsum
unalmis Aug 7, 2025
ad505ad
Merge branch 'ku/partialsum' into ku/nufft
unalmis Aug 7, 2025
39611e4
small optimization
unalmis Aug 7, 2025
a97b38e
small edits
unalmis Aug 7, 2025
8e3702a
working attempt at nuffts
unalmis Aug 8, 2025
11a3bf3
clean up
unalmis Aug 8, 2025
7c59869
Add comment
unalmis Aug 8, 2025
7ad892a
clean up logic
unalmis Aug 8, 2025
5d743f9
update comment
unalmis Aug 8, 2025
270f4e3
upload notebook to see if diff
unalmis Aug 8, 2025
32583cc
Adding tests
unalmis Aug 9, 2025
4ff85e8
Updating eps setting
unalmis Aug 9, 2025
996b58d
updating tests
unalmis Aug 10, 2025
90dd6ea
adding warnings for AD bug
unalmis Aug 10, 2025
d70a06b
running notebook with nufft compute
unalmis Aug 10, 2025
7348dff
add back important comment
unalmis Aug 10, 2025
15e8fc6
clarify code
unalmis Aug 10, 2025
9c44d07
clean up coordinate map
unalmis Aug 10, 2025
b4e9b9a
progress
unalmis Aug 10, 2025
6d3246e
Updating
unalmis Aug 11, 2025
74f2b12
Merge branch 'master' into ku/partialsum
unalmis Aug 11, 2025
a7ba43a
update plots
unalmis Aug 11, 2025
a83de07
add assert statement
unalmis Aug 11, 2025
c6f4523
change comment
unalmis Aug 11, 2025
9065461
Reduce tolerance
unalmis Aug 12, 2025
31a399d
Add links to issues
unalmis Aug 12, 2025
44d68b6
Update comment
unalmis Aug 12, 2025
8a9a482
Resolves #1574
unalmis Aug 13, 2025
03174ba
Merge branch 'master' into ku/partialsum
unalmis Aug 13, 2025
4c5fd6b
Merge branch 'ku/partialsum' into ku/nufft
unalmis Aug 13, 2025
dc1d21c
last commit
unalmis Aug 13, 2025
9341e97
Remove temp variables to help garbarge collection
unalmis Aug 13, 2025
7be33eb
dario comment suggestion
unalmis Aug 13, 2025
775bdf1
Pulling changes down from #1834 which are necessary to address @f0uri…
unalmis Aug 13, 2025
b919f01
Merge branch 'ku/partialsum' into ku/nufft
unalmis Aug 13, 2025
d5ff809
Add comment to address Rory comment
unalmis Aug 13, 2025
29dc77e
Merge branch 'ku/partialsum' into ku/nufft
unalmis Aug 14, 2025
2dc4bda
Add more warnings
unalmis Aug 14, 2025
4d9962e
clean up warnings
unalmis Aug 14, 2025
16dff27
fixing doc build
unalmis Aug 14, 2025
2b20f8d
Changing variable name for Rahul
unalmis Aug 14, 2025
4156e12
Merge branch 'ku/partialsum' into ku/nufft
unalmis Aug 14, 2025
fd2bc47
Add comments
unalmis Aug 14, 2025
b58e34e
Merge branch 'master' into ku/nufft
unalmis Aug 14, 2025
bd12d2e
Fixing stuff from 1529
unalmis Aug 15, 2025
01ee90e
Fixing stuff from 1529
unalmis Aug 15, 2025
41e1f7e
Removing NUFFTs from previous commit
unalmis Aug 15, 2025
eae25c9
Ensure gamma_c in [-1, 1]
unalmis Aug 15, 2025
0f46db3
Ku/real nufft (#1857)
unalmis Aug 15, 2025
fcba0a4
Reducing tolerance
unalmis Aug 15, 2025
79b6d3d
clean conditional
unalmis Aug 15, 2025
86a38c0
Add important fftfreq test
unalmis Aug 15, 2025
dbc22bf
Change code to increase code coverage
unalmis Aug 17, 2025
afb552b
Preparing for merge
unalmis Aug 17, 2025
15f4d96
Merge branch 'ku/fix_1529' into ku/nufft
unalmis Aug 17, 2025
51cb599
Clean up verbosity
unalmis Aug 17, 2025
314f852
Update _interp_utils.py
unalmis Aug 17, 2025
f628399
Making requested change to assume nufft2 is always used on real input
unalmis Aug 18, 2025
2921171
fix docstring
unalmis Aug 18, 2025
7d88e81
fix benign bug
unalmis Aug 18, 2025
aafc2f4
Update default resolutions
unalmis Aug 18, 2025
30fb2a9
Merge branch 'ku/fix_1529' into ku/nufft
unalmis Aug 18, 2025
340bde2
Update plot
unalmis Aug 18, 2025
d67269c
fix comment
unalmis Aug 18, 2025
cf1dba1
update label
unalmis Aug 18, 2025
8fcf3cd
Review requests
unalmis Aug 18, 2025
48bbc27
Merge branch 'master' into ku/nufft
unalmis Aug 20, 2025
9e1b9e7
Merge branch 'master' into ku/nufft
unalmis Aug 20, 2025
6a5dece
Add derivative tests
unalmis Aug 20, 2025
4e7b964
Make names consistent with recently officialized finufft tutorial
unalmis Aug 20, 2025
4c02276
Reduce memory in test
unalmis Aug 20, 2025
17a4ff7
fix typo
unalmis Aug 20, 2025
bde9479
Merge branch 'master' into ku/nufft
unalmis Aug 22, 2025
b6596f9
Merge
unalmis Aug 22, 2025
5044d04
Add comment to docstring
unalmis Aug 23, 2025
01de804
patching jax-finufft bug
unalmis Aug 23, 2025
3b182a3
Upload nufft optimization notebook
unalmis Aug 23, 2025
c052d4e
Reduce number of reshape/transpose to prepare for any unjitting requi…
unalmis Aug 24, 2025
aed8897
Add another test
unalmis Aug 24, 2025
946dcac
Update benchmarks
unalmis Aug 24, 2025
741e044
Fix benchmarks
unalmis Aug 24, 2025
154ac4e
Fixing benchmarks
unalmis Aug 24, 2025
935d747
STill trying to fix these dumb and useless benchmarks
unalmis Aug 24, 2025
8fd0106
Merge branch 'master' into ku/nufft
unalmis Aug 25, 2025
6f770b0
Merge branch 'master' into ku/nufft
unalmis Aug 25, 2025
14dca06
Ku/finufft gpu (#1881)
unalmis Aug 27, 2025
1090f0b
Update CHANGELOG.md
unalmis Aug 27, 2025
7347a90
Merge branch 'master' into ku/nufft
unalmis Aug 28, 2025
d4d5d24
Dancing to appease other developers
unalmis Aug 28, 2025
66fc063
Update benchmarks
unalmis Aug 28, 2025
b0b4678
fix link in docs
unalmis Aug 28, 2025
eaa6e4f
More dancing to appease developers
unalmis Aug 28, 2025
99a1342
Increasing codecov
unalmis Aug 29, 2025
16fe1c8
Adding TrappedResonance Objective, although is not currently running
Aug 29, 2025
8209995
f_tr1 function update, optimizer not working and objective function r…
Sep 4, 2025
07bd9f8
Add files via upload
jlabbate15 Sep 4, 2025
ce61025
objective function now working and outputting correct frequencies, ha…
Sep 7, 2025
7d3dba1
some retouches to previous commit
Sep 7, 2025
b25761c
middle of testing objective function, have to go to Italy dindin
Sep 7, 2025
752d40e
post-checks of TrappedResonance objective function, slight changes
Sep 7, 2025
e321e89
successful termination of optimization for both QS Triple Product and…
Sep 7, 2025
f31e652
barely-trapped and ripple-trapped particle filtering flags added (tes…
Sep 17, 2025
2d58c21
Updated objective function form to be more intuitive. See DESMOS
Sep 20, 2025
9c1dc58
Adding energy dimension into objective function
Sep 29, 2025
909a2f6
added radial drift (grad-psi) term to objective function
Sep 29, 2025
84793a8
fix to use correct iotas
Sep 29, 2025
67e2dd4
updates to TrappedResonance objective function, lots of them. is not …
Oct 7, 2025
403a539
new plotting for TrappedResonance testing, minor updates to TrappedRe…
Oct 9, 2025
760eeda
normalization updates to TrappedResonance
Oct 11, 2025
f954694
bug fixes in TrappedResonance, without psidrift term, objective funct…
Oct 12, 2025
334e1bc
oh my gosh it works TrappedResonance is working
Oct 12, 2025
bea4014
uploading progress for NERSC switch
Oct 17, 2025
0a12954
save my computer please
Oct 18, 2025
2a723f3
updates
Oct 18, 2025
a94d686
connection with poincare plotting in firm3d is working
Oct 18, 2025
1716505
small compute changes
Oct 23, 2025
4dcb8e1
beginning of new objective function form
Nov 1, 2025
5614866
progress on new objective function
Nov 1, 2025
339a122
completed new TRObj writeup based on Eq. 50 of Bounce Resonance Objec…
Nov 1, 2025
eb1c844
TRObj is running without errors, now can check values
Nov 2, 2025
ac0ac77
initial testing of f_tr2 complete
Nov 2, 2025
06fe5b3
same as previous just something finished running
Nov 2, 2025
af267fc
new objective function testing
Nov 4, 2025
20d1c89
omega_eta checks
Nov 4, 2025
3a276b6
moving to nersc
Nov 8, 2025
5818f15
changes over the past few weeks, trying to get organized
Dec 16, 2025
41c1deb
trying to create an optimization example
Dec 17, 2025
149601f
optimization not erroring out anymore
Dec 17, 2025
f3a082c
fixed bug, n^-2 not n^-1 in island width
Jan 5, 2026
33f7d74
updates pt 1 to f_tr2 to include 01-15-2026 meeting editions
Jan 19, 2026
011307c
DESC dev meeting editions (edits to TRObj to increase speed and optim…
Jan 22, 2026
58f16fb
fixing my mistakes
Jan 26, 2026
5b7c3b5
pre-testing code updates
Jan 27, 2026
41f52e5
barely-trapped filter update
Jan 27, 2026
284b6da
new updates to code now work with optimization
Jan 27, 2026
ece01b2
cleaning up comments
Jan 28, 2026
5688bd8
cleaning up comments
Jan 28, 2026
5ac4991
minor obj updates, fixing alpha averaging and some f bugs
Jan 29, 2026
28439a4
add surface-driven pitch_inv setting with user only specifying num_pitch
Jan 30, 2026
e24691f
TR obj and opt example updated
Jan 30, 2026
ef2b564
fixed non-scalar output of TRObj
Jan 30, 2026
9e040e8
resolution bug fixes and testing updates
Feb 5, 2026
6984d2c
Removing restriction on duplicate resonances.
ejpaul Feb 7, 2026
98c8c6f
Redefining drifts and initial testing.
ejpaul Feb 7, 2026
e47db96
Reverting some changes.
ejpaul Feb 10, 2026
5b812ae
Update after more testing.
ejpaul Feb 17, 2026
223be95
Island width now working.
ejpaul Feb 19, 2026
45cd0a2
Adding more debug diagnostics.
ejpaul Feb 20, 2026
cbc80b8
More diagnostics.
ejpaul Feb 20, 2026
cba36a3
Update to eta grid.
ejpaul Feb 21, 2026
2e4ee61
Fixing error with zero propagation. Adding in bump function capabilit…
ejpaul Feb 26, 2026
e368c88
Renaming integers.
ejpaul Feb 28, 2026
e56b88d
more updating.
ejpaul Feb 28, 2026
67a0542
Adding QA island width benchmarks.
ejpaul Feb 28, 2026
8670533
Adding QH benchmarks.
ejpaul Feb 28, 2026
a1f5344
Update to QA benchmark.
ejpaul Feb 28, 2026
16c8943
intermediate commit with phase-space averaging.
ejpaul Mar 3, 2026
bb2110d
Improving debug data.
ejpaul Mar 4, 2026
00d4ef1
Adding QI example.
ejpaul Mar 6, 2026
d177570
Now jax compatible.
ejpaul Mar 9, 2026
939200c
Merge branch 'ejp' of https://github.com/jlabbate15/DESC_TrappedRes i…
ejpaul Mar 9, 2026
6a27530
Fixing stab_sacrifice.
ejpaul Mar 9, 2026
5b27409
Some cleaning up. Fixing stab_sacrifice.
ejpaul Mar 9, 2026
6dd4cf3
Fix to wd_blur.
ejpaul Mar 10, 2026
6b3ffa6
updates to optimization example script
Mar 10, 2026
c12e56e
Fix to DEBUG output.
ejpaul Mar 12, 2026
6386653
Merge branch 'ejp' of https://github.com/jlabbate15/DESC_TrappedRes i…
ejpaul Mar 12, 2026
4fe4570
able to optimize TRObj, albeit slow
Mar 12, 2026
b6d2dc4
Merge branch 'ejp' of https://github.com/jlabbate15/DESC_TrappedRes i…
ejpaul Mar 12, 2026
7f47c50
Fixing radial weighting.
ejpaul Mar 15, 2026
4d893be
small fix to TRObj build method, num_quad sustanance
Mar 20, 2026
d5ae5f5
updates to optimization function call, further updates to come soon
Mar 26, 2026
d3f6c81
removed f_q_conservative, added wd_blur. optimization issues persist
Mar 26, 2026
2579e1a
documentation updates and some minor fixes
Apr 1, 2026
71f2517
Restructuring and redefining FSA.
ejpaul Jul 3, 2026
9a670ee
Merge resolution.
ejpaul Jul 3, 2026
e2638d7
Update to example notebooks.
ejpaul Jul 4, 2026
aa3a623
Restore QuasisymmetryTwoTermNormalized dropped by merge, notebook API…
ejpaul Jul 4, 2026
a736681
Merge remote-tracking branch 'upstream/master' into ejp-merge-master
ejpaul Jul 4, 2026
d345164
Apply black/isort/flake8 style fixes per CONTRIBUTING.rst
ejpaul Jul 4, 2026
8dd8ab8
Remove scratch/debug artifacts from ResonanceOpt before PR
ejpaul Jul 4, 2026
dd29fa5
Add unit test coverage for TrappedResonance
ejpaul Jul 4, 2026
da3076a
Add value-correctness test for TrappedResonance
ejpaul Jul 4, 2026
bad8c2e
Add 4-point stencil for linear resonance-weighting, enable resolution…
ejpaul Jul 4, 2026
58ee02e
Revert "Add 4-point stencil for linear resonance-weighting, enable re…
ejpaul Jul 6, 2026
2ecb981
Remove QuasisymmetryTwoTermNormalized before PR
ejpaul Jul 6, 2026
6fb110b
Remove scratch research artifacts before PR
ejpaul Jul 6, 2026
b81e927
Remove orphaned pytest-mpl baseline images
ejpaul Jul 6, 2026
4b77719
Remove duplicate CHANGELOG Performance Improvements section
ejpaul Jul 6, 2026
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ tests/benchmarks/.benchmarks/
*.swp
*.swo
.pymon
.DS_Store

# UV
uv.lock
Expand Down
1 change: 1 addition & 0 deletions desc/compute/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
_profiles,
_stability,
_surface,
_trapped_resonance,
)
from .data_index import all_kwargs, allowed_kwargs, data_index
from .utils import (
Expand Down
Loading
Loading