First attempt at ODE integration - #21

Merged

jhalpern30 merged 439 commits into

mainfrom

Oct 9, 2025

This pull request is big! We're only showing the most recent 250 commits

Commits on Jul 30, 2025

Merge branch 'ode_team' of github.com:OpenFUSIONToolkit/JPEC into ode_team
logan-nc
committed
5496d0f
DCON - WIP - making some updates to run the MainProgram up to sing_lim!
jhalpern30
committed
894db05
DCON - WIP - Sorting out more of the supposed globals
mfairborn23
committed
09da7a0
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
mfairborn23
committed
4286a04
ODE - WIP - adding equil_out functions
logan-nc
committed
6a6f841
Merge branch 'ode_team' of github.com:OpenFUSIONToolkit/JPEC into ode_team
logan-nc
committed
8faa74d
EQUIL - WIP - work continues on equil_out
logan-nc
committed
bab46f8
ODE - WIP - qfind and gse
ebursch
committed
9ff45da
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
ebursch
committed
ca1059b
EQUIL - BUGFIX - Fixed small issue
ebursch
committed
6d27c26
DCON - WIP - main script should be running up to four_fit calls (added placeholders for once equil.params is implemented
jhalpern30
committed
9be9cd2
DCON - WIP - Getting rid of globals
mfairborn23
committed
76307a3
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
mfairborn23
committed
9fe6372
DCON - WIP - fixed m1 in ode_output
mfairborn23
committed
c27b2ab
DCON - WIP - adding some missing struct calls to variables
jhalpern30
committed
629ad8b
EQUIL - UPDATE - New EquilibriumParameters setup and implemented qfind function
ebursch
committed
368f624
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
ebursch
committed
577a793
DCON - WIP - think all the globals are finally gone from ode_output
mfairborn23
committed
580a2d2
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
mfairborn23
committed
87b5032
DCON - WIP - fixed some bugs with variables
Dylan Brennan
authored and
Dylan Brennan
committed
4171e94
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
jhalpern30
committed
5328ef3
Merge branch 'ode_team' of github.com:OpenFUSIONToolkit/JPEC into ode_team
Dylan Brennan
authored and
Dylan Brennan
committed
b20533e
JPEC - Minor - Fixes typo in top level equil module import
logan-nc
committed
f79b838
EQUIL - Minor - Removed duplicated line
logan-nc
committed
72e6186
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
jhalpern30
committed
297ec1b
EQUIL - WIP - next iteration of equilibrium_separatrix_find!
logan-nc
committed
c8f9dff
Merge branch 'ode_team' of github.com:OpenFUSIONToolkit/JPEC into ode_team
logan-nc
committed
1ab76a4
DCON - IP - small bug fixes in ode
Dylan Brennan
authored and
Dylan Brennan
committed
7727447
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
jhalpern30
committed
558cf0e
EQUIL - BUGFIX - returned comments on equilibrium parameters
ebursch
committed
00d96a3
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
ebursch
committed
dbc5612
DCON - WIP - more small fixes
Dylan Brennan
authored and
Dylan Brennan
committed
e9c1773
EQUIL - BUGFIX - rmeoved BASE. not needed
ebursch
committed
fab7e9f
Merge branch 'ode_team' of github.com:OpenFUSIONToolkit/JPEC into ode_team
Dylan Brennan
authored and
Dylan Brennan
committed
8988897
DCON - WIP - storing outputs from fourfit functions (not 100% working yet, but doesn't quit out)
jhalpern30
committed
c948658
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
jhalpern30
committed
389808a
DCON - BUGFIX - Remove extra 'end'
Aaron Froese
committed
af45a38
DCON - WIP - getting rid of unwanted globals and fixing things that would break in sing and ode_output
mfairborn23
committed
c8613e9
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
mfairborn23
committed
e1d13d8
DCON - WIP - small changes
Dylan Brennan
authored and
Dylan Brennan
committed
9f26410
EQUIL - UPDATE - First pass at gse, still need to decide on output setups
ebursch
committed
f3dab88
DCON - WIP - more small changes
dylan-p-brennan
committed
769288e
DCON - WIP - Added some AI-generated function headers. We should check them for accuracy
mfairborn23
committed
cd4da27
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
mfairborn23
committed
3281c3a
EQUIL - UPDATE - Added var to EquilibriumParameters and populated inside qfind
ebursch
committed
b77d585
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
ebursch
committed
b675bc8
EQUIL - BUGFIX - Export fixing
ebursch
committed
017d616
EQUIL - UPDATE - Enforced Equilibrium naming convention (no more Equil)
ebursch
committed
4e25d8d
DCON - WIP - adding Evan/Nik's new equil parameters to sing_find (which has now been tested against fortran and works) and sing_lim a bit)
jhalpern30
committed
89ca920
EQUIL - BUGFIX - extrema bug
ebursch
committed
3f4b001
EQUIL - WIP - Adds more params
logan-nc
committed
7d19764
DCON - WIP - several smakll changes
dylan-p-brennan
committed
eb0e740
Merge branch 'ode_team' of github.com:OpenFUSIONToolkit/JPEC into ode_team
logan-nc
committed
a41e926
Merge branch 'ode_team' of github.com:OpenFUSIONToolkit/JPEC into ode_team
logan-nc
committed
a179686
DCON - BUGFIX - Previously filled u with the wrong values. Fixed now
mfairborn23
committed
2274f38
DCON -WIP remove non used files
gwanggeunseo
committed
1086836
EQUIL - UPDATE - WIP gse hdf5 for plotting implementation
ebursch
committed
acf4a1d
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
ebursch
committed
2c3508a
EQUIL - WIP - typo fix
logan-nc
committed
c45e955
DCON - WIP - Remove using JPEC lines (circular logic)
logan-nc
committed
f97411a
Merge branch 'ode_team' of github.com:OpenFUSIONToolkit/JPEC into ode_team
logan-nc
committed
d840037
DCON - BUGFIX - AI forgot to initialize odet.index
Aaron Froese
committed
f0f08ee
DCON - MINOR - Added utils.jl to DconMod
Aaron Froese
committed
56ccb42
EQUIL - WIP - typo fix
logan-nc
committed
8c34487
Merge branch 'ode_team' of github.com:OpenFUSIONToolkit/JPEC into ode_team
logan-nc
committed
9526790
DCON - WIP - trying to obtain values from the proper structs in ode_fixup
mfairborn23
committed
daa4e14
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
mfairborn23
committed
c013dae
EQUIL - BUGFIX - Equil/Equilibrium issue was overwritten
ebursch
committed
d9efb5d
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
ebursch
committed
202bff1
DCON - WIP - more small changes
dylan-p-brennan
committed
83f1689
DCON - IP - small fix
dylan-p-brennan
committed
ab7e844
DCON - BUGFIX - JPEC.Equilibrium issue which was crashing the project
ebursch
committed
6358b91
DCON - WIP - added the prefixes to the things in ode_unorm
mfairborn23
committed
a7c8a67
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
mfairborn23
committed
97fa82d
DCON - WIP - fixed and checked sing_lim against fortran dcon, should be working now. Also moved all using statements to module definition
jhalpern30
committed
412ee07

Commits on Jul 31, 2025

Commits on Aug 1, 2025

DCON - BUG FIX - Minor syntax issues
bclyons12
committed
6444091
EQUIL-MINOR-makefile error (this might not work in window)
jaesun57
committed
730cb22
EQUIL - MINOR - adding integral in spline
jaesun57
committed
90643d9
EQUIL - MINOR - replace the spline to original version
jaesun57
committed
5919785
EQUIL - WIP - Inverse equilibrium wip
jaesun57
committed
2363ddc
EQUIL - MINOR - MAKE FILE replace
jaesun57
committed
7df0903
Merge branch 'ode_team' into reorg_splines
bclyons12
committed
23f6b7e
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
jhalpern30
committed
ccb8fb4
DCON - WIP - fixing FourFitVars struct so it compiles again
jhalpern30
committed
a471142
DCON - MINOR - small fixes and aesthetics
jhalpern30
committed
2148bdf
DCON - WIP - pretty major overhaul of ode_output functions, they should be ready for testing and compile. Run should now fail at ode_step
jhalpern30
committed
e0c942a

Commits on Aug 2, 2025

Merge branch 'ode_team' into reorg_splines
bclyons12
committed
b20255a
SPLINES - REFACTOR - Create parametric CubicSpline struct
bclyons12
committed
27edf7f
fspline now can read f coefficient & mistake fix
jmlmir369
committed
810976d
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
jmlmir369
committed
ef4842e
fspline now can read f coefficient & mistake fix
jmlmir369
committed
c2baddb
Update makefile
jmlmir369
authored
f595a40

Commits on Aug 3, 2025

DCON -WIP fourfit make_matrix working amat,bmat validated
gwanggeunseo
committed
d98d461
DCON - WIP bugfix
gwanggeunseo
committed
12d2616
DCON -WIP matrix validation at fourfit_example2.ipynb
gwanggeunseo
committed
11668ae

Commits on Aug 4, 2025

fourfit A~H works, FGK not yet, fspline mistake fix
jmlmir369
committed
b216edd
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
jmlmir369
committed
8951b55
DCON - WIP - A couple minor changes to ode_ideal_cross and ode_step to ensure that things are being declared and implemented correctly
mfairborn23
committed
5b8210e
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
mfairborn23
committed
675214f
DCON - MINOR - Looks like spline_eval is the correct call for all spline evals, even complex splines. Fixing this in sing_der
mfairborn23
committed
7f997f4
Merge branch 'ode_team' into reorg_splines
bclyons12
committed
0c40218
Finish refactor of CubicSpline
bclyons12
committed
42eadd4
Merge branch 'equil_dev' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
jhalpern30
committed
ce6f7c2
Merge branch 'ode_team' into reorg_splines
bclyons12
committed
da7201c
DCON - WIP - sing_der was missing some important calculations. Fixed.
mfairborn23
committed
c08f86e
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
mfairborn23
committed
b2cb0ed
NOTEBOOKS - MINOR - Remove cruft causing error
bclyons12
committed
e697680
SPLINES - MINOR - Simplify CubicSpline coding with `similar`
bclyons12
committed
01ff2c6
Cleaned up ode_output_get_crit comments after validating it with fortran version
jhalpern30
committed
ae7ddd9
EQUIL - WIP - allocate and define local arrays.
jaesun57
committed
966ea08
Mistake in Fourierspline.jl fix
jmlmir369
authored
6e07285
Update make_docs.yaml
matt-pharr
authored
2a89d5b
Update make_docs.yaml
matt-pharr
authored
111f768
Update make_docs.yaml
matt-pharr
authored
62c40e6
Update make_docs.yaml
matt-pharr
authored
bdf0ddf
Julia-fy BicubicSpline
bclyons12
committed
3905c48
Update make_docs.yaml
matt-pharr
authored
a5d2abc
Merge branch 'ode_team' into reorg_splines
bclyons12
committed
7d0166c
DCON - ENVIRONMENT - Fix missing BandedMatrices
bclyons12
committed
c2a8bf8
Merge branch 'ode_team' into reorg_splines
bclyons12
committed
fc60af2
BUILD - BUGFIX - fixed overwritten build system
matt-pharr
committed
3f23e33
Merge pull request #33 from OpenFUSIONToolkit/ode_patch_test
matt-pharr
authored
9f33704
Merge branch 'ode_team' into reorg_splines
bclyons12
committed
7cf97d3
DCON - WIP - major updates to ode_step and sing_der to make it Julia DiffEq compliant, need to debug still
jhalpern30
committed
da6f071

Commits on Aug 5, 2025

SPLINES - MINOR - Simplify empty vector initiation
bclyons12
committed
9ad620c
SPLINES - REFACTOR - Julia-fy FourierSpline
bclyons12
committed
e83f342
Merge pull request #32 from OpenFUSIONToolkit/reorg_splines
matt-pharr
authored
146f73b
DCON - WIP - some updates to get it to compile. Added dummy ffit variable
jhalpern30
committed
72a8683
Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
jhalpern30
committed
55fcab7
Merge origin/main into ode_team
matt-pharr
committed
f11787f
EQUIL - WIP - transform input coordinates from cartesian to polar.
jaesun57
committed
bedf7cd
EQUIL - WIP - set up radial grid (only "ldp" implemented) others will be added
jaesun57
committed
00ff2e7
EQUIL - WIP - prepare new bicube type for coordinates.
jaesun57
committed
2fb3e4a
EQUIL - WIP - prepare new bicube type for coordinates.
jaesun57
committed
fe64339
EQUIL - WIP - prepare new bicube type for coordinates.
jaesun57
committed
ba44afc
EQUIL - WIP - rzphi done
jaesun57
committed
9067aaa
EQUIL - NEW FEATURE - inverse.f
jaesun57
committed
f36d4c8
EQUIL - NEW - inverse.f all set
jaesun57
committed
5b001a2
DCON - BUGFIX - updating spline calls. Still have error in equilibrium intialization
jhalpern30
committed
73a9898
DCON - WIP Initial Integration of fourfit.jl with FourFitVars struct for DCON workflow
gwanggeunseo
committed
e2b2fe3
DCON - WIP - removing the fourfit module and extra lines in fourfit.jl
jhalpern30
committed
693ecc9
EQUIL - ERROR - spline fitting type error fixed
jaesun57
committed
cd97525
DCON - WIP - adding errors for non implemented functions
jhalpern30
committed
873f31c
EQUIL- MINOR - remove files
jaesun57
committed
8b66285
SPLINES - REFACTOR - Use constructors instead of setup functions
bclyons12
committed
3b1fe35
DCON - BUG FIX - Add Equilibrium module for setup_equilibrium()
bclyons12
committed
f3d3ba2
DCON - BUG FIX - Make FourFitVars compatible with fourfit.jl
bclyons12
committed
f865a0b
ARCHITECTURE - MINOR - Remove Revise from package Project.toml
bclyons12
committed
752ccec

Commits on Aug 6, 2025

Commits on Aug 8, 2025

Fspline, spline_example2 fixed
jmlmir369
committed
4c58f17

Commits on Aug 12, 2025

Commits on Aug 13, 2025

Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
jhalpern30
committed
b7ce3ed

Commits on Aug 16, 2025

TEST - BUGFIX - Tests not running per-commit
matt-pharr
authored
9f4eaad

Commits on Aug 18, 2025

Commits on Aug 21, 2025

EQUIL - NEW - Chease binary reading with inverse solver
ebursch
committed
dccde65

Commits on Aug 26, 2025

Merge branch 'ode_team' of https://github.com/OpenFUSIONToolkit/JPEC into ode_team
jhalpern30
committed
dd7edc6

Commits on Aug 27, 2025

DCON - WIP - cleaning up fourfit, adding testing (very rough code rn)
jhalpern30
committed
c5bebad

Commits on Aug 28, 2025

Commits on Sep 2, 2025

Commits on Sep 3, 2025

DCON - WIP - cleaning up this branch for a pull request
jhalpern30
committed
0824dd8
DCON - WIP - validation from fourfit files
jhalpern30
committed
3d613eb
DCON - BUGFIX - minor fixes
jhalpern30
committed
a423f95

Commits on Sep 4, 2025

DCON/EQUIL- MINOR - updating using statements for more minimal diffeq imports
jhalpern30
committed
8c0afd1

Commits on Sep 5, 2025

Commits on Sep 9, 2025

Commits on Sep 10, 2025

Commits on Sep 11, 2025

Commits on Sep 16, 2025

Commits on Sep 19, 2025

Commits on Sep 22, 2025

DCON - WIP - debugging ua calculation, think its working correctly now
jhalpern30
committed
a698d1c

Commits on Sep 23, 2025

DCON - WIP - getting rid of second while true loop in ode_run, starting to debug crit.out
jhalpern30
committed
c5f760a

Commits on Sep 24, 2025

Commits on Sep 25, 2025

DCON - WIP - cleanups, adding hdf5 dumping for locstab data
jhalpern30
committed
f0aa513
DCON - MINOR - cleaning up sing.jl
jhalpern30
committed
b9c84db

Commits on Sep 29, 2025

EQUIL - MINOR - changing gse file writes to go to where the run directory is
jhalpern30
committed
a5e7b91

Commits on Sep 30, 2025

DCON - WIP - adding vacuum functionality, might be working?
jhalpern30
committed
cfc2919
DCON - MINOR - cleanups
jhalpern30
committed
edb6706

Commits on Oct 2, 2025

DCON - WIP - adding output writing to dcon.out, crit.out, and euler.bin (probs not working), made sing_get_ca function in the process
jhalpern30
committed
0d61bfa

Commits on Oct 3, 2025

DCON - WIP - updating way outputs are written, better support for HDF5 writing, starting inclusion of saving u in memory
jhalpern30
committed
715fece

Commits on Oct 7, 2025

DCON - WIP - writing outputs to euler.h5/saving in memory for GPEC use
jhalpern30
committed
d8adc12

Commits on Oct 8, 2025

Commits on Oct 9, 2025