Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
dcc21e5
Updated branch to dd/B_plasma
maya-avida Jun 13, 2025
e366f23
Implemented Chebyshev polynomial derivatives to basis.py
maya-avida Jun 13, 2025
303f5f4
Chebyshev derivatives
maya-avida Jun 16, 2025
81d4ced
Implementation of method 3 for vacuum region magnetic field calculati…
maya-avida Jun 18, 2025
1b65ff1
Virtual casing method for vacuum region magnetic field implemented; n…
maya-avida Jun 19, 2025
9acdf92
Debugging for curl computation in cylindrical coordinates, and implem…
maya-avida Jun 30, 2025
fde7041
New grid designed to be used in cylindrical coordinates, and new basi…
maya-avida Jul 1, 2025
710382d
For curl(A) method of calculating B_plasma, A now calculated on full …
maya-avida Jul 7, 2025
a767eb8
Extended flux coordinates; still need to implement R/Z/sqrt(g)/metric…
maya-avida Jul 8, 2025
8c93443
Merge remote-tracking branch 'origin/master' into ma/rpz_basis
maya-avida Jul 8, 2025
102750f
Changed alpha to have more distance from R/Z=0/1
maya-avida Jul 9, 2025
83cf8b2
Documentation for compute_magnetic_field and nabla
maya-avida Jul 9, 2025
fb3231a
Documentation for virtual_casing.py, black formatted virtual_casing, …
maya-avida Jul 10, 2025
0dc4de0
Modifications of hopefully make the virtual casing method jitable; th…
maya-avida Jul 10, 2025
99625cd
Reordering of arguments in compute_magnetic_field was causing problem…
maya-avida Jul 10, 2025
27fde67
accidentally broke equilibrium.py
maya-avida Jul 10, 2025
97c6572
uncommented grid override
maya-avida Jul 10, 2025
9ec8478
throw=False in diffrax diffeqsolve
maya-avida Jul 11, 2025
5254bd6
FFT and DCT implementation in transform class for RPZ grid and basis
maya-avida Jul 15, 2025
7bce24b
Changed defaults on CylindricalGrid
maya-avida Jul 15, 2025
e36df12
RPZ transform.fit method updated to accommodate 2D input
maya-avida Jul 15, 2025
4f17ad0
Partial sums + toroidal FFT for RPZ grid/basis
maya-avida Jul 15, 2025
fefd48b
Reordering of the arguments in compute_magnetic_field (it broke field…
maya-avida Jul 16, 2025
8cb3dae
Merged Daniel's modifications to the Biot-Savart integration script
maya-avida Jul 16, 2025
cee1ddb
temporary change so I can do field-line integrations w biot-savart me…
maya-avida Jul 18, 2025
aa8b255
temporary change so I can do field-line integrations w biot-savart me…
maya-avida Jul 18, 2025
4fd961d
added support for different grid and basis M in rpz transform method
maya-avida Jul 21, 2025
771a5dc
implemented direct sums for rpz basis
maya-avida Jul 21, 2025
22d20f7
First attempt at singularity handling for Biot-Savart magnetic field …
maya-avida Jul 28, 2025
cc01886
BMW formatting (there are circular imports here that I am about to fi…
maya-avida Aug 2, 2025
f496ce1
Merge remote-tracking branch 'public_origin/master' into ma/bmw_format
maya-avida Aug 2, 2025
9ba2af7
merged with master
maya-avida Aug 2, 2025
d8a0ebb
Bug fixes + circular import fixes
maya-avida Aug 2, 2025
43305ee
bug fixing for BMW formatting
maya-avida Aug 4, 2025
dc44155
default source grid for bmw format
maya-avida Aug 7, 2025
9aa6136
Utility functions for testing if a point is inside the plasma
maya-avida Aug 12, 2025
70ecefd
tests for in_plasma
maya-avida Aug 12, 2025
897b2ca
FIELDLINES format (hopefully)
maya-avida Aug 12, 2025
504c6ee
save_fieldlines now also includes coil field
maya-avida Aug 12, 2025
acacf8e
fixing transform, which broke during merge
maya-avida Aug 13, 2025
f89eb98
Initial commit on branch (originally c3a05aa)
maya-avida Aug 13, 2025
6907e9e
Code cleaning for draft PR
maya-avida Aug 13, 2025
c87dfa1
Merge branch 'master' into ma/rpz_basis
maya-avida Aug 13, 2025
2c037a7
Merge branch 'ma/rpz_basis' into ma/bmw_format
maya-avida Aug 13, 2025
246c006
Option to replace field inside the plasma with DESC equilibrium solve…
maya-avida Aug 13, 2025
64914d5
Merge branch 'dd/B_plasma' into ma/rpz_basis
ddudt Aug 13, 2025
a0e9aa0
fixing merge conflicts with dd/B_plasma
daniel-dudt Aug 13, 2025
569ac44
accidentally broke nabla
maya-avida Aug 13, 2025
b15484e
Merge branch 'ma/rpz_basis' of https://github.com/PlasmaControl/DESC …
maya-avida Aug 13, 2025
b55ccff
Merge branch 'ma/rpz_basis' into ma/bmw_format
maya-avida Aug 13, 2025
417f2ba
broke nabla again
maya-avida Aug 14, 2025
1cadd7b
Merge branch 'ma/rpz_basis' into ma/bmw_format
maya-avida Aug 14, 2025
4a9450a
adding compute function for gamma integrand (#1529)
gretahibbard Aug 14, 2025
1aa059e
Debug in in_plasma
maya-avida Aug 14, 2025
a721de4
vector potential method now avoids singularities and has a new API
maya-avida Aug 14, 2025
2ab6b4d
Merge branch 'ma/rpz_basis' into ma/bmw_format
maya-avida Aug 14, 2025
63cfacb
more debugging in save_fieldlines
maya-avida Aug 14, 2025
9366e42
Realized I didn't stage plasma_field
maya-avida Aug 14, 2025
b6b110e
Merge branch 'ma/rpz_basis' into ma/bmw_format
maya-avida Aug 14, 2025
573eadd
modified plasma_field for saving
maya-avida Aug 14, 2025
5f2ec5d
debug
maya-avida Aug 14, 2025
771b03c
Partial summation in coordinate mapping (#1826)
unalmis Aug 14, 2025
7176b4a
return_data lost in merge
maya-avida Aug 14, 2025
be41381
how did this get in here
maya-avida Aug 15, 2025
7eaf8d6
ensuring inputs are correct # of dims
maya-avida Aug 15, 2025
eae6d21
Vector potential interp
maya-avida Aug 15, 2025
d6f32f8
Accounted for reordering of nodes in phi direction
maya-avida Aug 15, 2025
ad88533
Bug fix in plasma_field
maya-avida Aug 15, 2025
b5b8603
bug fix
maya-avida Aug 15, 2025
63de2cd
Merge remote-tracking branch 'public_origin/master' into ma/rpz_basis
maya-avida Aug 18, 2025
3e28c49
make plasma_field work under jit
maya-avida Aug 19, 2025
9617f4c
fixed docstring for compute_magnetic_grid
maya-avida Aug 19, 2025
a8d5c25
fix to plasma_field that prevents the phi coordinates from being reor…
maya-avida Aug 19, 2025
17b5f72
errors from wrong basis
maya-avida Aug 19, 2025
9edb54e
Better documentation for chebyshev transforms and removing PowerDoubl…
maya-avida Aug 20, 2025
1d3af1c
Fixing desc/transform.py to pass tests
maya-avida Aug 20, 2025
53b093c
removed confusing _fft_poloidal=True flag
maya-avida Aug 20, 2025
42079e0
no need to enforce symmetry since symmetry is always false
maya-avida Aug 20, 2025
55b3d45
Virtual casing now passes tests
maya-avida Aug 20, 2025
9a84afc
Unit tests for biot-savart and virtual casing methods of computing ma…
maya-avida Aug 21, 2025
4e570c4
fixed test_basis and test_grid to pass tests
maya-avida Aug 21, 2025
09ff328
batching for winding number calc
maya-avida Aug 15, 2025
3c4b46c
ensuring inputs are correct # of dims
maya-avida Aug 15, 2025
f3f3e93
Vector potential interp
maya-avida Aug 15, 2025
cedc604
Accounted for reordering of nodes in phi direction
maya-avida Aug 15, 2025
6b93a04
adding compute function for gamma integrand (#1529)
gretahibbard Aug 14, 2025
44da4d9
Partial summation in coordinate mapping (#1826)
unalmis Aug 14, 2025
981b7da
make plasma_field work under jit
maya-avida Aug 19, 2025
5d7bc41
save_fieldlines with plasma grid object
maya-avida Aug 19, 2025
241986c
removing default source grids (not necessary for fieldlines) and bett…
maya-avida Aug 19, 2025
a92f3bd
more static attributes for plasma_field
maya-avida Aug 21, 2025
34dcfd5
changed default chunk_size for getting initial guess
maya-avida Aug 21, 2025
dda91fa
Moved save_fieldlines_format to another file
maya-avida Aug 21, 2025
0df38b5
fixed circular imports, hopefully
maya-avida Aug 22, 2025
641487d
Moved PlasmaField to magnetic_fields
maya-avida Aug 22, 2025
b9c0166
Merge branch 'ma/rpz_basis' into ma/bmw_format
maya-avida Aug 22, 2025
b60b48a
preventing divide by zero in compute/nabla, and some unit tests
maya-avida Aug 22, 2025
7c99e62
Better documentation for equilibrium and virtual casing, and the obse…
maya-avida Aug 22, 2025
b694ad6
Merge branch 'ma/rpz_basis' into ma/bmw_format
maya-avida Aug 25, 2025
f8b0d28
Manual chunking using for loops for replace_in_plasma flag
maya-avida Aug 25, 2025
85fa44e
bug fix in save_filedlines_format
maya-avida Aug 27, 2025
2cf3baa
Updated docstrings for eq.compute_magnetic_field and the output formats
maya-avida Oct 12, 2025
ceba71e
convert to numpy array to prevent FIELDLINES error
maya-avida Oct 17, 2025
acf4e98
add pressure=None in case eq=None
maya-avida Oct 17, 2025
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ New Features
- Adds the classes ``FourierXYCurve`` and ``FourierXYCoil`` to represent planar curves/coils with Fourier series for X and Y instead of the radius.
- Removes default objective and constraints for ``desc.equilibrium.Equilibrium.optimize``, so now user is required to pass in the constraints and objective when using this method.
- Adds ``PlasmaCoilSetDistanceBound`` objective to allow a simultaneous constraint on minimum and maximum distance between the plasma and coils.
- Adds ``grid.meshgrid_flatten`` for flattening 3d data to a 1d array in the correct order.
- Adds `desc.plotting.plot_field_lines` function, which integrates and then plots magnetic field line trajectories in 3D.
- `desc.magnetic_fields.field_line_integrate` now integrates the field line always in the given `phis` direction, and `phis` will always correspond to the physical toroidal angle (instead of time like coordinate previously). Previous implementation might have caused confusion about the output positions, especially when the magnetic field has negative toroidal component.
- Adds ``grid.meshgrid_flatten`` for flattening 3d data to a 1d array in the correct order.
- Ability to obtain the top eigenvalues and the corresponding eigenfunctions from the ``ideal ballooning lambda`` compute function by specifying the variable ``Neigvals``.
- Parallelized ideal ballooning stability and Newcomb ballooning metrics and [other improvements](https://github.com/PlasmaControl/DESC/pull/1763).
- Adds ``FourierXYCoil`` to compatible coils for ``CoilSetArclengthVariance`` objective.
- Separated ``gamma_c`` calculation from ``Gamma_c``. User can also plot ``gamma_c`` using the ``plot_gammac`` function.

Bug Fixes

Expand Down
Loading