Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
8392992
RDCON - WIP - Added cell info to netcdf outputs
matt-pharr Jun 17, 2025
b80308f
DOCS - MINOR - updated sing_spot to be in line with sing_spot scans
matt-pharr Jun 17, 2025
2c9f4c1
RDCON & OTHERS - Added resolution option for the inner layer cells; f…
matt-pharr Jun 27, 2025
cb4b1ae
GPEC - BUGFIX - fixed out of bounds array access when only one ration…
matt-pharr Jul 15, 2025
f27f665
RPEC - IMPROVEMENT - Added comments denoting variable purposes to rma…
matt-pharr Sep 15, 2025
c018007
RPEC - IMPROVEMENT - Added comments denoting variable purposes to all…
matt-pharr Sep 16, 2025
1f174e6
RMATCH - BUGFIX - changed faulty line labels in match.f solution output.
matt-pharr Sep 17, 2025
2675a2b
Merge branch 'develop' into RDCON_singcoup
matt-pharr Sep 23, 2025
effd950
RMATCH - IMPROVEMENT - Reworked eigenvalue/rotation interface in rmat…
matt-pharr Sep 23, 2025
e5a138c
Merge remote-tracking branch 'origin/develop' into RDCON_singcoup
matt-pharr Sep 24, 2025
ae03e75
EQUIL - IMPROVEMENT - Tweaked allocation safety checks on alloc/dealloc
matt-pharr Sep 26, 2025
e887ad4
EQUIL - MINOR - Added logic to avoid double spline allocation if refo…
matt-pharr Sep 26, 2025
2f0cdc9
RDCON, RMATCH - IMPROVEMENT - Added reading of rdcon galerkin boundar…
matt-pharr Sep 26, 2025
8b8e92f
GPEC - CODE CLEANUP - Symmetrized idcon_build between galerkin and id…
matt-pharr Sep 26, 2025
2feea55
RDCON, RMATCH - IMPROVEMENT - Added writing of rdcon galerkin boundar…
matt-pharr Sep 26, 2025
f345f65
RDCON, RMATCH - WIP - galerkin boundaries straggler code
matt-pharr Sep 26, 2025
ba2387f
RDCON, RMATCH - WIP - temporarily disabling rdcon equilibrium reform
matt-pharr Sep 30, 2025
06c5136
RDCON/RMATCH/GPEC - IMPROVEMENTS - Added reading B field from rmatch …
matt-pharr Oct 13, 2025
5642a07
ALL - FORMATTING - Removed trailing white spaces
matt-pharr Oct 13, 2025
c7ef637
GPEC - BUGFIX - fixed reading in rmatch b field for ideal cases (do not)
matt-pharr Oct 13, 2025
9e10719
EQUIL, STRIDE, RDCON, DCON, PENTRC, GPEC - IMPROVEMENT - moved deprec…
matt-pharr Oct 14, 2025
c649f7d
RDCON - WIP - cleaned up RDCON/RMATCH outputs
matt-pharr Oct 14, 2025
b401b98
GPEC - FEATURE - Added new parameters for resistive singular layer wi…
matt-pharr Oct 14, 2025
e931e67
GPEC - IMPROVEMENT - Updated example rmatch.in to disable binary outp…
matt-pharr Oct 14, 2025
b3d72f1
GPEC - IMPROVEMENT - Refactored reading of grid data in rdcon.f and m…
matt-pharr Oct 16, 2025
6e2eb6f
GPEC - WIP - Added term to calculation of resistive sweet spot and se…
matt-pharr Oct 21, 2025
d596e62
GPEC - BUGFIX, IMPROVEMENT - Fixed netcdf resistive quantity writes, …
matt-pharr Nov 2, 2025
d79caed
MAKE - MINOR - Removed ignore errors flag
matt-pharr Nov 2, 2025
1c33612
EQUIL - BUGFIX - fixed stack size problem introduced with nstep change
matt-pharr Nov 2, 2025
1823cd3
MAKE - WIP - Undid accidental makefile changes
matt-pharr Nov 2, 2025
4310f34
RDCON, RMATCH, GPEC - Made final tweaks to order of setting deltac nu…
matt-pharr Feb 2, 2026
cb9e305
TEST - MINOR - removed bugged rm lines
matt-pharr Feb 2, 2026
39273e2
Merge "develop" into "RDCON_singcoup"
matt-pharr Feb 13, 2026
a045183
GPEC - REFACTOR - Uncommented Stuart's regridding
matt-pharr Feb 16, 2026
a302033
GPEC - NEW - Add res_psilim_diff parameter to gpec inputs to change p…
matt-pharr Feb 16, 2026
6fb786f
Merge "make_improvements" into "RDCON_singcoup"
matt-pharr Feb 16, 2026
2645056
Merge remote-tracking branch 'origin/develop' into RDCON_singcoup
logan-nc Mar 11, 2026
be1e9b8
Fix two bugs in sing.f: qlim and sing_min psilow
logan-nc Mar 11, 2026
a88910c
Fix: deallocate sq_in instead of sq in lar.f
logan-nc Mar 11, 2026
28f6df6
Fix: check out_ahg2msc after reading namelist in equil_loadnamelists
logan-nc Mar 11, 2026
5de3b4a
Revert: remove spurious allocate/deallocate of y_out in direct_run
logan-nc Mar 11, 2026
93c4704
Fix: replace localcoup_out with localcoup_out_vecs in gpout_singcoup
logan-nc Mar 11, 2026
c370b14
Fix: remove orphaned WRITE statements in gpout_singfld ASCII output
logan-nc Mar 11, 2026
5601c3f
Fix: deallocate bwpmns_rmatch in gpout_bparmns
logan-nc Mar 11, 2026
45c2c86
Fix: deallocate cellinfos arrays in gal_dealloc
logan-nc Mar 11, 2026
545b00f
Fix: add msing.o dependency for deltac.o in DEPENDENCIES.inc
logan-nc Mar 11, 2026
4ad0246
Merge make_test
matt-pharr Mar 11, 2026
572feba
MAKE - MINOR - Update DEPENDENCIES.inc
matt-pharr Mar 11, 2026
c65d32c
RDCON - BUGFIX - Fixed broken deallocate
matt-pharr Mar 11, 2026
a1b8fca
RDCON - BUGFIX - re-did edit to rdcon/dcon.f to undo mistake
matt-pharr Mar 11, 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
6 changes: 3 additions & 3 deletions input/rdcon.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
ndiagnose=12 ! The number of eigenfunctions written when diagnosing lsode
/
&GAL_OUTPUT
interp_np=3 ! The number of interpration points for outputting Galerkin solution
interp_np_res=60 ! The number of interpration points for outputting Galerkin solution in resonant and extension cells
restore_uh=t ! Include the Hermite solution in Galerkin soluitn
interp_np=3 ! The number of interpretation points for outputting Galerkin solution
interp_np_res=60 ! The number of interpretation points for outputting Galerkin solution in resonant and extension cells
restore_uh=t ! Include the Hermite solution in Galerkin solution
restore_us=t ! Include the small solution in Galerkin solution
restore_ul=t ! Include the larger solution in Galerkin solution
bin_delmatch=t ! Output solution for rmatch
Expand Down
146 changes: 73 additions & 73 deletions input/rmatch.in
Original file line number Diff line number Diff line change
@@ -1,94 +1,94 @@
&RMATCH_INPUT
galsol_filename = "gal_solution.dat"
galsol_filename_cut = "gal_solution_cut.dat"
deltabin_filename = "delta_gw.dat"
galsol_filename = "gal_solution.dat" ! File containing Galerkin solutions
galsol_filename_cut = "gal_solution_cut.dat" ! File containing resistive/cut Galerkin solutions
deltabin_filename = "delta_gw.dat" ! File containing delta matrix from RDCON

match_flag=t
scan_flag=f
qscan_flag=f
sol_flag =f
deflate=f
nroot=5
itermax=5000
relax_fac=0.5
msing=20
initguess = ( 0,10)
eta=8e-8,8e-8,8e-8,8e-8 ! Resistivity at each rational surface, starting from the core
massden=3.3e-07,3.3e-07,3.3e-07,3.3e-07 ! Mass density (kg/m^3) at each rational surface, starting from the core. 3.3e-7 is ni=1e20 m^-3.
scan_x1 = 1e-9
scan_x0 = 1.90E-10
! Scans, solves, and matching options. Not used with RPEC.
match_flag=t ! Compute inner region matching data; not used with RPEC
scan_flag=f ! Scan over eta; not used with RPEC
qscan_flag=f ! Scan over eigenvalue Q; not used with RPEC
sol_flag =f ! Newton solve for single eigenvalue; not used with RPEC
deflate=f ! Divides Delta determinant by PRODUCT(guess-oldroots)
nroot=5 ! Number of eigenvalues to find
itermax=5000 ! Maximum number of iterations in Newton solve
relax_fac=0.5 ! Numerical relaxation factor in Newton solve
msing=4 ! Number of singular surfaces to include in matching
initguess = ( 0,10) ! Initial guess for eigenvalues in Newton solve
scan_x0 = 1.90E-10 ! Start of scan range if doing any scan
scan_x1 = 1e-9 ! End of scan range if doing any scan
scan_nstep = 50 ! Number of steps in scan if doing any scan
qscan_ising=2 ! Which singular surface to scan Q over
deltar_flag=t ! Run and record Galerkin GGJ model in Fourier space
deltac_flag=t ! Run and record Galerkin GGJ model in configuration space
deltaj_flag=t ! Run and record Jardin finite element GGJ model
qscan_out=f ! Output delta from Q scan?

scan_nstep = 50
! Resistive MHD options
eta=8e-8,8e-8,8e-8,8e-8 ! Resistivity at each rational surface, starting from the core
massden=3.3e-07,3.3e-07,3.3e-07,3.3e-07 ! Mass density (kg/m^3) at each rational surface, starting from the core. 3.3e-7 is ni=1e20 m^-3.
model="deltac" ! Which method to use for computing inner layer response. Options are "deltar", "deltac", "deltaj".

model="deltac"
qscan_ising=2
deltar_flag=t
deltac_flag=t
deltaj_flag=t
qscan_out=f

match_sol%flag=t
match_sol%uniform=t
match_sol%qpert=2
match_sol%auto_connect=f
match_sol%connect_threshold=1e-3
match_sol%b_flag=f
coil%ideal_flag=f
match_sol%flag=t ! Write outsol_qpert.bin
match_sol%uniform=t ! Use a uniform grid in psi?
match_sol%qpert=2 ! Which mode to write in outsol_qpert.bin?
match_sol%auto_connect=f ! run match.f/match_auto_connect; false in examples, unknown precise behavior
match_sol%connect_threshold=1e-3 ! Proportional difference between outer and inner solutions for match_auto_connect to connect them
match_sol%b_flag=f ! Write solutions in terms of b instead of xi
coil%ideal_flag=f ! Write ideal galerkin solution instead of resistive -- combined with GPEC this is physically equivalent to running regular DCON
/
&RMATCH_OUTPUT
bin_rpecsol=f
out_rpecsol=f
bin_rpecsol=f ! Write outer and inner solutions to binary files
out_rpecsol=f ! Write outer and inner solutions to ascii files
/
&DELTAC_LIST
tid=3,5,6,4
deltac_bin_sol=f
deltac_out_sol=f
tid=3,5,6,4 ! Something to do with which solution indexes are used in computing combined solutions. Always 3,5,6,4 in examples.
deltac_bin_sol=f ! Write deltac solutions to binary files for xdraw
deltac_out_sol=f ! Write deltac solutions to ascii files

rescale=t
pfac=0.1
xfac=10.0
gal_method="normal"
noexp=t
nx=128
nq=5
deltac_tol=1e-11
dx1dx2_flag=f
dx1=0.001
dx2=0.002
restore_ul=t
restore_uh=t
restore_us=t
rescale=t ! Rescale x during asymptotic matching for better numerical behavior
pfac=0.1 ! Packing ratio? Should it be the same as in RDCON?
gal_method="normal" ! Something to do with cell types used? Options are "normal", "resonant". "normal" in examples.
noexp=t ! Unknown function. Always true in examples.
nx=128 ! The number of elements in each interval between two singular surfaces
nq=5 ! The number of Gaussian points in each Galerkin element
deltac_tol=1e-11 ! Tolerance of lsode integration
dx1dx2_flag=f ! Flag to include the special dx1 and dx2 treatments for resonant and extension element
dx1=0.001 ! The size of resonant element
dx2=0.002 ! The size of extension element
restore_ul=t ! Include the Hermite solution in Galerkin solution
restore_uh=t ! Include the small solution in Galerkin solution
restore_us=t ! Include the larger solution in Galerkin solution

cutoff=20
cutoff=20 ! The number of elements include the large solution as the driving term

interp_np=5
order_pow=20
order_exp=20
interp_np=5 ! The number of interpretation points for outputting Galerkin solution
order_pow=20 ! The order of polynomial expansion of large solution in asymptotic matching
order_exp=20 ! The order of exponential expansion of small solution in asymptotic matching

diagnose_res=f
diagnose_res=f ! Diagnose asymptotic solutions in ua.out/ua.bin

x0_ua=0.3
x1_ua=1
nx_ua=100
outt=3
x0_ua=0.3 ! Unknown function for diagnose_res
x1_ua=1 ! Unknown function for diagnose_res
nx_ua=100 ! Number of points for diagnose_res
outt=3 ! Unknown function for diagnose_res
/
&NYQUIST_INPUT
nyquist%flag=f
nyquist%ns=100
nyquist%flag=f ! Make nyquist plot
nyquist%ns=100 ! Parameter for nyquist plot

nyquist%small=.01
nyquist%big=300
nyquist%narc=32
nyquist%small=.01 ! Unknown function for nyquist plot
nyquist%big=300 ! Unknown function for nyquist plot
nyquist%narc=32 ! Unknown function for nyquist plot

nyquist%out=t
nyquist%bin=t
nyquist%out=t ! ASCII output of nyquist plot data
nyquist%bin=t ! Binary output of nyquist plot data
/
&MSING_LIST
msing_diagnose=f
vmat_filename="vmat.bin"
sing_frac=0.2
sing_nout=100
us_flag=t
ul_flag=t
msing_diagnose=f ! Writes resonant power-series solutions to diagnose msing
vmat_filename="vmat.bin" ! File containing Vacuum energy matrix from RDCON
sing_frac=0.2 ! Unknown function for diagnose msing
sing_nout=100 ! Number of points for diagnose msing
us_flag=t ! Unknown function for diagnose msing
ul_flag=t ! Unknown function for diagnose msing
/