Skip to content
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

Bugfix/b3 d thermalization #335

Merged
merged 4 commits into from
Jan 7, 2025
Merged

Bugfix/b3 d thermalization #335

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21d43cd
BEAMS3D: further fix to vel. diff calc.
kudav Dec 12, 2024
08c758f
BEAMS3D: fix for thermalization in coll. calc
kudav Dec 11, 2024
e4bb8b0
BEAMS3D: removed max() for modb in physics_mod
kudav Jan 7, 2025
07c3fd0
fixed the last commit
kudav Jan 7, 2025
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
16 changes: 8 additions & 8 deletions BEAMS3D/Sources/beams3d_physics_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ SUBROUTINE beams3d_physics_gc(t, q)
! Initialize values
te_temp = 0; ne_temp = 0; ti_temp = 0; zeff_temp=1;
speed = 0; reduction = 0; modb=0;bphi_temp=0;omeg_temp=0;
vrot_para=0;vrot_perp=0;binv=0

tau_spit_inv = 0.0; v_crit = 0.0; coulomb_log = 15
tau_inv = 10.0; vcrit_cube = 0.0; vc3_tauinv = 0
Expand Down Expand Up @@ -329,9 +330,9 @@ SUBROUTINE beams3d_physics_gc(t, q)
!-----------------------------------------------------------
inv_mymass = one/mymass
vrot_para = omeg_temp*r_temp*bphi_temp*binv
vrot_perp = SQRT(omeg_temp*omeg_temp*r_temp*r_temp - vrot_para*vrot_para)
vrot_perp = SQRT(max(omeg_temp*omeg_temp*r_temp*r_temp - vrot_para*vrot_para,zero))
vll = vll - vrot_para
speed = SQRT(vll*vll + 2*moment*modb*inv_mymass - vrot_perp*vrot_perp)
speed = SQRT(max(vll*vll + 2*moment*modb*inv_mymass - vrot_perp*vrot_perp,zero))

!-----------------------------------------------------------
! Helpers
Expand Down Expand Up @@ -386,12 +387,11 @@ SUBROUTINE beams3d_physics_gc(t, q)
!-----------------------------------------------------------
dve = speed*tau_spit_inv*(1-2*te_temp*inv_mymass*e_charge/speed**2.0)
dvi = vc3_tauinv/(speed*speed)*(1+ti_temp*inv_mymass*e_charge/speed**2.0)
reduction = dve + dvi
newspeed = speed - reduction*dt+sigma*zeta
reduction = (dve + dvi)*dt+sigma*zeta
newspeed = speed - reduction
dve=dve+ddve
dvi=dvi+ddvi
vfrac = newspeed/speed

!-----------------------------------------------------------
! Thermalize particle or adjust vll and moment
! Fowler et al. NF 1990 30 (6) 997--1010
Expand All @@ -406,10 +406,10 @@ SUBROUTINE beams3d_physics_gc(t, q)
ltherm = .true.
vfrac = newspeed/speed
vll = vfrac*vll
moment = half*mymass*(newspeed*newspeed - vll*vll + vrot_perp*vrot_perp)*binv
moment = max(half*mymass*(newspeed*newspeed - vll*vll + vrot_perp*vrot_perp)*binv,zero)
q(4) = vll + vrot_para
RETURN
END IF
END IF
l = MAX(MIN(CEILING(rho_temp*h1_prof),ns_prof1),1)
epower_prof(mybeam,l) = epower_prof(mybeam,l) + mymass*dve*dt*speed*weight(myline)
ipower_prof(mybeam,l) = ipower_prof(mybeam,l) + mymass*dvi*dt*speed*weight(myline)
Expand All @@ -426,7 +426,7 @@ SUBROUTINE beams3d_physics_gc(t, q)
zeta_mean = zeta_o *(one - speed_cube ) ! The new mean in the distribution.
zeta = zeta*sigma + zeta_mean ! The new pitch angle.
!!!The pitch angle MUST NOT go outside [-1,1] nor be NaN; but could happen accidentally with the distribution.
zeta = MIN(MAX(zeta,-0.999D+00),0.999D+00)
zeta = MIN(MAX(zeta,-0.99999D+00),0.99999D+00)
!Flip gaussian at boundary to prevent accumulation around pitch=1
!zeta=zeta-SIGN(one,zeta)*MAX((ABS(zeta)-0.999D+00),zero)
!Pitch angle scattering according to NUBEAM
Expand Down
Loading