Skip to content

Equilibrium edge reconstruction using an asymptotically robust analytic/numerical method #241

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

Draft
StuartBenjamin wants to merge 101 commits into
base: develop
Choose a base branch
from
Draft

Equilibrium edge reconstruction using an asymptotically robust analytic/numerical method #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
755a7b1
test commit
StuartBenjamin Feb 13, 2024
6f34609
Prep for nstepd to be a potential user input
StuartBenjamin May 27, 2024
eb5a648
prep for nstepd to be a user input
StuartBenjamin May 27, 2024
fd3c1d7
Merge https://github.com/StuartBenjamin/GPEC into equilibrium_edge
StuartBenjamin May 27, 2024
5e57381
added logic during loop over psi surfaces to call x-point scripts or …
StuartBenjamin May 27, 2024
3bf5518
changing direct_fl_int to start and end at arbitrary etas (formatting…
StuartBenjamin May 27, 2024
9dac974
updated formatting/printing for direct_fl_int (not certain if correct..)
StuartBenjamin May 27, 2024
2626a9e
'find flux surface' section within direct_fl_int now its own function…
StuartBenjamin May 27, 2024
8416c35
formatting/error messanging on direct_fl_int working now
StuartBenjamin May 27, 2024
b578f80
adding global module variables that contain x-point info
StuartBenjamin May 27, 2024
a8ce25d
Returning a pre-existing line that was eliminated for some reason
StuartBenjamin May 27, 2024
7f7d1fe
modifying direct_run to call direct_initialise_xpoints
StuartBenjamin May 27, 2024
182a024
adding inputs/outputs of direct_initialise_xpoints. Note eta_maxes,et…
StuartBenjamin May 27, 2024
1a9d8bb
direct_initialise_xpoints debugged, working well
StuartBenjamin May 28, 2024
50e09e3
direct_local_xpoint debugged, finds local xpoint w newton method
StuartBenjamin May 29, 2024
545844d
updating direct_local_xpoint description
StuartBenjamin May 29, 2024
82581a6
added direct_Bnu, direct_saddle_angle both in a working state
StuartBenjamin May 29, 2024
ecc259e
updating direct_Bnu to also calculate B_rho
StuartBenjamin Jun 1, 2024
146c4cf
udated direct_saddle_angle to also calc angle where Brho = 0
StuartBenjamin Jun 1, 2024
8a904bd
fixing up debug statement in direct_saddle_angle
StuartBenjamin Jun 1, 2024
58f1a00
Newton method direct_saddle_angle_DEPRECATED (doesn't seem work, but …
StuartBenjamin Jun 1, 2024
06b7c02
direct_psisaddle first commit, runs but not debugged
StuartBenjamin Jun 1, 2024
3f1b6e9
cleaned up direct_psisaddle's linear psi regime logic
StuartBenjamin Jun 1, 2024
8638998
fixed occasional segfault in direct_psisaddle
StuartBenjamin Jun 1, 2024
9a051d9
improving direct_psisaddle's debug statement
StuartBenjamin Jun 1, 2024
caefef1
direct_xpoint added, runs but not properly debugged yet
StuartBenjamin Jun 1, 2024
388e2f9
direct_initialise_xpoints: dq_eps now an input + minor changes
StuartBenjamin Jun 4, 2024
32555bc
fixed direct_initialise_xpoints non-wrap case treatment of final point
StuartBenjamin Jun 4, 2024
303deb7
prepping direct_run for inclusion of direct_mixed_spline_builder
StuartBenjamin Jun 4, 2024
6b8d3dd
direct_mixed_spline_builder first push, for num_xpts=1, will evaluate…
StuartBenjamin Jun 4, 2024
3a0694d
added some debug statements for direct_mixed_spline_builder
StuartBenjamin Jun 4, 2024
bc53478
direct_mixed_spline_builder numerical int now working for num_xtps=2
StuartBenjamin Jun 4, 2024
a8aa84c
xpt_varthetas2 added to make sure x1 in direct_analytic_ints correctl…
StuartBenjamin Jun 5, 2024
fb9f2c5
b11 sign fix
StuartBenjamin Jun 5, 2024
002ad26
swapping float4 1.0 with float8 'one'
StuartBenjamin Jun 5, 2024
7ace62b
direct_saddle_coords, direct_saddle_coords_inv added and half-debugged
StuartBenjamin Jun 6, 2024
d1a12cd
option usevth2 added, fixes failure to replicate correct asymptotic b…
StuartBenjamin Jun 6, 2024
7a30db3
added direct_analytic_ints, NOT DEGBUGGED YET
StuartBenjamin Jun 6, 2024
42ec51e
direct_analytic_ints minor radius formula fixed
StuartBenjamin Jun 6, 2024
57a4262
simplify vartheta calculation since nu(1) should always be greater th…
StuartBenjamin Jun 6, 2024
980973d
direct_analytic_ints debugged, tested and working for all jacobians s…
StuartBenjamin Jun 10, 2024
d2279dc
adding ff construction in direct_mixed_spline_builder IMPORTANT: ff$f…
StuartBenjamin Jun 11, 2024
81e6348
case of x-point slightly outside separatrix now automatically sets us…
StuartBenjamin Jun 13, 2024
5ea8796
aded new function find_fl_surface2: finds r,z given psi, eta. Uses a …
StuartBenjamin Jun 13, 2024
199c744
cleaning up direct_psisaddle
StuartBenjamin Jun 13, 2024
b720407
direct_fl_int print statments improved
StuartBenjamin Jun 13, 2024
284b604
direct_xpoint now has optional print statements for direct_local_xpoi…
StuartBenjamin Jun 13, 2024
98b8353
preparing direct_run to recieve direct_mixed_spline_builder
StuartBenjamin Jun 13, 2024
fba2084
direct_run print and verbose statements added
StuartBenjamin Jun 13, 2024
5135847
improving print statements in direct_fl_int
StuartBenjamin Jun 13, 2024
9719119
building ff and y_out for 1-xpoint in direct_mixed_spline_builder. In…
StuartBenjamin Jun 13, 2024
348995b
clarifying debug/output statements in direct_mixed_spline_builder
StuartBenjamin Jun 13, 2024
b9504df
removed deprecated output from direct_mixed_spline_builder, improved …
StuartBenjamin Jun 13, 2024
4a6969a
direct_mixed_spline_builder now builds y_out, ff for 2 x-point cases
StuartBenjamin Jun 13, 2024
635cf49
added function direct_spline_comparison to output a comparison betwee…
StuartBenjamin Jun 13, 2024
c78c20c
replicating latest GPEC commit
StuartBenjamin Jun 13, 2024
070ccb9
added xpt bin units
StuartBenjamin Jun 13, 2024
a72b6be
Empty-Commit to establish new branch
logan-nc Jun 14, 2024
3b84d30
Merge pull request #165 from StuartBenjamin/equilibrium_edge
logan-nc Jun 14, 2024
5049305
new convergence & result printing capabilities added (code is rough, …
StuartBenjamin Aug 18, 2024
b3ac452
direct_fl_int draft changes added (commented out)
StuartBenjamin Aug 18, 2024
9451ca7
bug fix: DO loop start no longer set to -1 (causes error)
StuartBenjamin Aug 18, 2024
382d786
adding & adjusting new control variables
StuartBenjamin Feb 8, 2026
1df65be
adding module variables to control printing of results
StuartBenjamin Feb 8, 2026
6f67cc0
adding variable that checks whether xpoint is inside separatrix or not
StuartBenjamin Feb 8, 2026
da78496
New finalised function list
StuartBenjamin Feb 8, 2026
f21a63a
updating direct_run input variable list and initialisations
StuartBenjamin Feb 8, 2026
a50091a
intermittent error for large arrays
StuartBenjamin Feb 8, 2026
f952bea
initial search for x-points added to direct_run. Also option to call …
StuartBenjamin Feb 8, 2026
d729e67
changing direction of psi surface loop in direct_run to start with ou…
StuartBenjamin Feb 8, 2026
366ae84
simplifying interior of direct_run to use a separate function (direct…
StuartBenjamin Feb 8, 2026
6df3c16
updating direct_fl_int variables and initialisations... this flux sur…
StuartBenjamin Feb 8, 2026
57cbb0d
updating formatting terms
StuartBenjamin Feb 8, 2026
645473d
adding x-point stopping logic to direct_fl_int
StuartBenjamin Feb 8, 2026
f214201
updating direct_fl_int to save variables and/or print warnings after …
StuartBenjamin Feb 8, 2026
bc7e22e
shifting direct_fl_der, direct_refine and direct_output to their orig…
StuartBenjamin Feb 8, 2026
cb0ee6a
updating find_fl_surface2 description
StuartBenjamin Feb 8, 2026
f9a58a3
adding new function direct_xpt_y_out that calls the numerical field l…
StuartBenjamin Feb 8, 2026
32b9473
updating subroutine numbers
StuartBenjamin Feb 8, 2026
e5388b0
removing deprecated newton method for calculating direct_saddle_angle
StuartBenjamin Feb 8, 2026
030e4e5
updating variable b11 to c11 to match notation in paper (https://doi.…
StuartBenjamin Feb 8, 2026
e0cc1dc
updating some print statements
StuartBenjamin Feb 8, 2026
04aebb1
revmogin deprecated code from direct_xpoint
StuartBenjamin Feb 8, 2026
ef07140
updating x-point id tolerance
StuartBenjamin Feb 8, 2026
7776067
removing deprecated function direct_initialise_xpoints
StuartBenjamin Feb 8, 2026
85b787d
updating direct_saddle_coords to allow use of exact angle coordinates…
StuartBenjamin Feb 8, 2026
6691383
updating direct_saddle_coords_inv to allow use of exact angle coordin…
StuartBenjamin Feb 8, 2026
5262cf5
missed line from previous two commits
StuartBenjamin Feb 8, 2026
9b00e78
adding new function int_validity_check that checks the criteria given…
StuartBenjamin Feb 8, 2026
e7d11a2
updating direct_analytic_ints to allow use of exact angles
StuartBenjamin Feb 8, 2026
491367c
big updates to direct_analytic_ints, some new expressions for yi1-yi3
StuartBenjamin Feb 8, 2026
bbe28ea
big updates to direct_analytic_ints regarding yi4. Also, outputs comp…
StuartBenjamin Feb 8, 2026
ae21864
removing deprecated code + adding the function interp_through_zero wh…
StuartBenjamin Feb 8, 2026
29f5014
adding three functions, patch_two_a, patch_two_b, patch_two_c that sp…
StuartBenjamin Feb 8, 2026
cecd5b5
adding new function yinterim that is used by patch_two_a-c
StuartBenjamin Feb 8, 2026
b231a26
adding function analytic_y_out that computes field line integrals usi…
StuartBenjamin Feb 8, 2026
f7bc19b
updating subroutine number
StuartBenjamin Feb 8, 2026
6543f4d
adding function plot_xpt_convergence that calculates numerical vs ana…
StuartBenjamin Feb 8, 2026
6aa2329
minor changes to direct_mod variables
StuartBenjamin Feb 8, 2026
a9dbb93
Empty-Commit to establish new branch
logan-nc Jun 14, 2024
e36fc8e
Merge branch 'equilibrium_edge_princeton_repo' of https://github.com/…
StuartBenjamin Feb 9, 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
Loading