-
Notifications
You must be signed in to change notification settings - Fork 2
Resistive singular coupling #210
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.
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
Open
matt-pharr
wants to merge
50
commits into
develop
Choose a base branch
from
RDCON_singcoup
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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 b80308f
DOCS - MINOR - updated sing_spot to be in line with sing_spot scans
matt-pharr 2c9f4c1
RDCON & OTHERS - Added resolution option for the inner layer cells; f…
matt-pharr cb4b1ae
GPEC - BUGFIX - fixed out of bounds array access when only one ration…
matt-pharr f27f665
RPEC - IMPROVEMENT - Added comments denoting variable purposes to rma…
matt-pharr c018007
RPEC - IMPROVEMENT - Added comments denoting variable purposes to all…
matt-pharr 1f174e6
RMATCH - BUGFIX - changed faulty line labels in match.f solution output.
matt-pharr 2675a2b
Merge branch 'develop' into RDCON_singcoup
matt-pharr effd950
RMATCH - IMPROVEMENT - Reworked eigenvalue/rotation interface in rmat…
matt-pharr e5a138c
Merge remote-tracking branch 'origin/develop' into RDCON_singcoup
matt-pharr ae03e75
EQUIL - IMPROVEMENT - Tweaked allocation safety checks on alloc/dealloc
matt-pharr e887ad4
EQUIL - MINOR - Added logic to avoid double spline allocation if refo…
matt-pharr 2f0cdc9
RDCON, RMATCH - IMPROVEMENT - Added reading of rdcon galerkin boundar…
matt-pharr 8b8e92f
GPEC - CODE CLEANUP - Symmetrized idcon_build between galerkin and id…
matt-pharr 2feea55
RDCON, RMATCH - IMPROVEMENT - Added writing of rdcon galerkin boundar…
matt-pharr f345f65
RDCON, RMATCH - WIP - galerkin boundaries straggler code
matt-pharr ba2387f
RDCON, RMATCH - WIP - temporarily disabling rdcon equilibrium reform
matt-pharr 06c5136
RDCON/RMATCH/GPEC - IMPROVEMENTS - Added reading B field from rmatch …
matt-pharr 5642a07
ALL - FORMATTING - Removed trailing white spaces
matt-pharr c7ef637
GPEC - BUGFIX - fixed reading in rmatch b field for ideal cases (do not)
matt-pharr 9e10719
EQUIL, STRIDE, RDCON, DCON, PENTRC, GPEC - IMPROVEMENT - moved deprec…
matt-pharr c649f7d
RDCON - WIP - cleaned up RDCON/RMATCH outputs
matt-pharr b401b98
GPEC - FEATURE - Added new parameters for resistive singular layer wi…
matt-pharr e931e67
GPEC - IMPROVEMENT - Updated example rmatch.in to disable binary outp…
matt-pharr b3d72f1
GPEC - IMPROVEMENT - Refactored reading of grid data in rdcon.f and m…
matt-pharr 6e2eb6f
GPEC - WIP - Added term to calculation of resistive sweet spot and se…
matt-pharr d596e62
GPEC - BUGFIX, IMPROVEMENT - Fixed netcdf resistive quantity writes, …
matt-pharr d79caed
MAKE - MINOR - Removed ignore errors flag
matt-pharr 1c33612
EQUIL - BUGFIX - fixed stack size problem introduced with nstep change
matt-pharr 1823cd3
MAKE - WIP - Undid accidental makefile changes
matt-pharr 4310f34
RDCON, RMATCH, GPEC - Made final tweaks to order of setting deltac nu…
matt-pharr cb9e305
TEST - MINOR - removed bugged rm lines
matt-pharr 39273e2
Merge "develop" into "RDCON_singcoup"
matt-pharr a045183
GPEC - REFACTOR - Uncommented Stuart's regridding
matt-pharr a302033
GPEC - NEW - Add res_psilim_diff parameter to gpec inputs to change p…
matt-pharr 6fb786f
Merge "make_improvements" into "RDCON_singcoup"
matt-pharr 2645056
Merge remote-tracking branch 'origin/develop' into RDCON_singcoup
logan-nc be1e9b8
Fix two bugs in sing.f: qlim and sing_min psilow
logan-nc a88910c
Fix: deallocate sq_in instead of sq in lar.f
logan-nc 28f6df6
Fix: check out_ahg2msc after reading namelist in equil_loadnamelists
logan-nc 5de3b4a
Revert: remove spurious allocate/deallocate of y_out in direct_run
logan-nc 93c4704
Fix: replace localcoup_out with localcoup_out_vecs in gpout_singcoup
logan-nc c370b14
Fix: remove orphaned WRITE statements in gpout_singfld ASCII output
logan-nc 5601c3f
Fix: deallocate bwpmns_rmatch in gpout_bparmns
logan-nc 45c2c86
Fix: deallocate cellinfos arrays in gal_dealloc
logan-nc 545b00f
Fix: add msing.o dependency for deltac.o in DEPENDENCIES.inc
logan-nc 4ad0246
Merge make_test
matt-pharr 572feba
MAKE - MINOR - Update DEPENDENCIES.inc
matt-pharr c65d32c
RDCON - BUGFIX - Fixed broken deallocate
matt-pharr a1b8fca
RDCON - BUGFIX - re-did edit to rdcon/dcon.f to undo mistake
matt-pharr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| 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. | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| 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. | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| 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 | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| x1_ua=1 ! Unknown function for diagnose_res | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| nx_ua=100 ! Number of points for diagnose_res | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| outt=3 ! Unknown function for diagnose_res | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| / | ||
| &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 | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| nyquist%big=300 ! Unknown function for nyquist plot | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| nyquist%narc=32 ! Unknown function for nyquist plot | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| 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 | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| sing_nout=100 ! Number of points for diagnose msing | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| us_flag=t ! Unknown function for diagnose msing | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ul_flag=t ! Unknown function for diagnose msing | ||
matt-pharr marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| / | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.