Skip to content

Addition of Phi_res_crit_callen #274

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

Merged
logan-nc merged 3 commits into from
Jul 24, 2026
Merged

Addition of Phi_res_crit_callen #274

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37a1b4c
GPEC - FEATURE - Add Phi_res_crit_callen critical resonant flux output
priyanshlunia Jul 20, 2026
d2fff07
GPEC - FIX - Consistent slayer/callen naming for singflx_crit outputs
logan-nc Jul 23, 2026
eb0db17
GPEC - FIX - Widen/clarify singfld ASCII columns
logan-nc Jul 24, 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
53 changes: 39 additions & 14 deletions gpec/gpout.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1556,7 +1556,7 @@ SUBROUTINE gpout_singfld(egnum,xspmn,spots,interpspot,nspot,
$ a_id,pp_id,cp_id,wp_id,np_id,dp_id,dd_id,pr_id,wc_id,
$ bc_id,ti_id,te_id,ni_id,ne_id,we_id,wi_id,q1_id,rh_id,
$ r1_id,ssp_id,lq_id,rt_id,at_id,wmin_id,wsat_id,pm_id,
$ ps_id,astat
$ ps_id,pcc_id,astat

INTEGER :: itheta,ising,icoup
REAL(r8) :: respsi,lpsi,rpsi,shear,hdist,sbnosurf
Expand Down Expand Up @@ -1587,7 +1587,8 @@ SUBROUTINE gpout_singfld(egnum,xspmn,spots,interpspot,nspot,
REAL(r8), DIMENSION(0:mthsurf) :: r_tmp
TYPE(spline_type) :: sr

REAL(r8), DIMENSION(msing) :: b_crit, ti_r, te_r, ni_r, ne_r,
REAL(r8), DIMENSION(msing) :: b_crit_slayer, b_crit_callen,
$ ti_r, te_r, ni_r, ne_r,
$ q1_r, we_r, wi_r, rh_r, r1_r, dP_r, P_r
REAL(r8) :: omega_i,omega_e,jxb,omega_sol,br_th,slayer_shear,
$ pleft, pright, psileft, psiright
Expand Down Expand Up @@ -1714,7 +1715,8 @@ SUBROUTINE gpout_singfld(egnum,xspmn,spots,interpspot,nspot,
hw_v_crit(ising) = 0.0_r8
hw_sat(ising) = 0.0_r8
hw_min(ising) = 0.0_r8
b_crit(ising) = 0.0_r8
b_crit_slayer(ising) = 0.0_r8
b_crit_callen(ising) = 0.0_r8
dP_r(ising) = 0.0_r8
P_r(ising) = sq%f(2) / mu0
IF (callen_threshold_flag. OR. slayer_threshold_flag) THEN
Expand Down Expand Up @@ -1843,6 +1845,16 @@ SUBROUTINE gpout_singfld(egnum,xspmn,spots,interpspot,nspot,
! convert from meters to psi_n for clear comparision to hw_isl
hw_v_crit(ising) = hw_v_crit(ising) / sr%f1(1)

! Critical resonant flux for w_vac = w_v_crit (Callen); the
! analog of the SLAYER b_crit_slayer for direct
! model comparison. Since w_vac ~ sqrt(Phi_res), the flux
! needed to reach the critical width is Phi_res*(w_crit/w_vac)^2
! (hw_v and hw_v_crit are both in psi_n here).
IF (ALLOCATED(vsingfld) .AND. hw_v(ising) > 0.0_r8) THEN
b_crit_callen(ising) = ABS(vsingfld(ising))
$ * (hw_v_crit(ising) / hw_v(ising))**2
ENDIF

! If we are above hw_v_crit then we can estimate the pressure lost assuming flat
! pressure inside the island. NOTE: this per-surface dP_r/P_r
! estimate uses the unmodified equilibrium pressure (sq) for
Expand Down Expand Up @@ -1878,19 +1890,21 @@ SUBROUTINE gpout_singfld(egnum,xspmn,spots,interpspot,nspot,
$ kin%f(9),kin%f(5),omega_e,omega_i,sq%f(4),slayer_shear,
$ bt0,sr%f(1),ro,mi,slayer_inpr_loc,resm,nn,ascii_flag,
$ delta_s,psi0,jxb,omega_sol,br_th)
b_crit(ising)=br_th ! Tesla. Normal resonant field comparable to singflx
b_crit_slayer(ising)=br_th ! Tesla. Normal resonant field comparable to singflx
ENDIF

IF (verbose) THEN

IF (callen_threshold_flag .OR. slayer_threshold_flag) THEN
IF(ising == 1) WRITE(*,'(1x,11a13)')
$ "psi","q","singflx","singlfx_crit","chirikov",
IF(ising == 1) WRITE(*,'(1x,3a13,2a20,7a13)')
$ "psi","q","singflx",
$ "singflx_crit_slayer","singflx_crit_callen",
$ "chirikov",
$ "w_island", "w_v", "w_v_crit",
$ "w_sat","w_min","dP/P"
WRITE(*,'(1x,es13.3,f13.3,2es13.3,f13.3,6es13.3)')
WRITE(*,'(1x,es13.3,f13.3,es13.3,2es20.3,f13.3,6es13.3)')
$ respsi,sq%f(4),ABS(singflx_mn(resnum(ising),ising)),
$ ABS(b_crit(ising)),
$ ABS(b_crit_slayer(ising)),ABS(b_crit_callen(ising)),
$ chirikov(ising),2*hw_isl(ising),
$ 2*hw_v(ising),2*hw_v_crit(ising),
$ 2*hw_sat(ising),2*hw_min(ising),
Expand Down Expand Up @@ -1967,16 +1981,19 @@ SUBROUTINE gpout_singfld(egnum,xspmn,spots,interpspot,nspot,
WRITE(out_unit,*)
WRITE(out_unit,'(1x,a12,1x,I4)')"msing =",msing
WRITE(out_unit,*)
WRITE(out_unit,'(1x,a6,18(1x,a16))')"q","psi","spot",
WRITE(out_unit,'(1x,a6,12(1x,a16),3(1x,a19),4(1x,a16))')
$ "q","psi","spot",
$ "real(singflx)","imag(singflx)",
$ "real(singcur)","imag(singcur)",
$ "real(singbwp)","imag(singbwp)",
$ "real(Delta)","imag(Delta)",
$ "half_w_isl","chirikov",
$ "half_w_isl_v_crit","singflx_crit",
$ "half_w_sat","half_w_min","dP","P"
$ "half_w_isl_v_crit",
$ "singflx_crit_slayer","singflx_crit_callen",
$ "half_w_sat","half_w_min","dP_w_sat","P_res"
DO ising=1,msing
WRITE(out_unit,'(1x,f6.3,18(es17.8e3))')
WRITE(out_unit,
$ '(1x,f6.3,12(es17.8e3),3(es20.8e3),4(es17.8e3))')
$ singtype(ising)%q,singtype(ising)%psifac,
$ spots(ising),
$ REAL(singflx_mn(resnum(ising),ising)),
Expand All @@ -1985,7 +2002,8 @@ SUBROUTINE gpout_singfld(egnum,xspmn,spots,interpspot,nspot,
$ REAL(singbwp(ising)),AIMAG(singbwp(ising)),
$ REAL(delta(ising)),AIMAG(delta(ising)),
$ hw_isl(ising),chirikov(ising),
$ hw_v_crit(ising),b_crit(ising),
$ hw_v_crit(ising),
$ b_crit_slayer(ising),b_crit_callen(ising),
$ hw_sat(ising),hw_min(ising),
$ dP_r(ising),P_r(ising)
ENDDO
Expand Down Expand Up @@ -2077,6 +2095,12 @@ SUBROUTINE gpout_singfld(egnum,xspmn,spots,interpspot,nspot,
CALL check( nf90_put_att(fncid, bc_id, "units", "T") )
CALL check( nf90_put_att(fncid, bc_id, "long_name",
$ "Critical resonant field for island growth from SLAYER") )
CALL check( nf90_def_var(fncid, "Phi_res_crit_callen",

@logan-nc logan-nc Jul 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here the name is ok because it is consistent with the old netcdf Phi_res_crit... I suppose we could update the old one to be Phi_res_crit_slayer but that will require updating OMFIT too.

$ nf90_double, (/q_id/), pcc_id) )
CALL check( nf90_put_att(fncid, pcc_id, "units", "T") )
CALL check( nf90_put_att(fncid, pcc_id, "long_name",
$ "Critical resonant field for island growth from Callen "//
$ "model") )
CALL check( nf90_def_var(fncid, "K_isl", nf90_double,
$ (/q_id/), k_id) )
CALL check( nf90_put_att(fncid, k_id, "long_name",
Expand Down Expand Up @@ -2164,7 +2188,8 @@ SUBROUTINE gpout_singfld(egnum,xspmn,spots,interpspot,nspot,
CALL check( nf90_put_var(fncid, wsat_id, 2*hw_sat) )
CALL check( nf90_put_var(fncid, dp_id, dP_r) )
CALL check( nf90_put_var(fncid, pr_id, P_r) )
CALL check( nf90_put_var(fncid, bc_id, b_crit) )
CALL check( nf90_put_var(fncid, bc_id, b_crit_slayer) )
CALL check( nf90_put_var(fncid, pcc_id, b_crit_callen) )
CALL check( nf90_put_var(fncid, k_id, chirikov) )
CALL check( nf90_put_var(fncid, ti_id, ti_r) )
CALL check( nf90_put_var(fncid, te_id, te_r) )
Expand Down
Loading