Skip to content

removed SIMD from include_CoulombCollisions_GC_p around new random call #72

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

Open
mbeidler3 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

removed SIMD from include_CoulombCollisions_GC_p around new random call #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ca20e5
removed SIMD from include_CoulombCollisions_GC_p around new random call
mbeidler3 Nov 8, 2024
c422bc6
merging in main
mbeidler3 Nov 14, 2024
fd738dd
fixing params%bound_electron_model conditional statements
mbeidler3 Nov 14, 2024
13d55c6
taking random%uniform%get out of OMP SIMD loops
mbeidler3 Nov 14, 2024
f69ce64
removing more random%uniform%get from OMP SIMD loops
mbeidler3 Nov 14, 2024
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
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cmake -DCMAKE_BUILD_TYPE:String=$BUILD_TYPE \
-DUSE_PSPLINE=ON \
-DUSE_FIO=OFF \
-DKORC_TEST=OFF \
-DCMAKE_Fortran_FLAGS="-malign-double -fconvert='big-endian'" \
-DCMAKE_Fortran_FLAGS="-malign-double -fconvert='big-endian' -fallow-argument-mismatch" \
-DCMAKE_C_FLAGS="-malign-double" \
-DCMAKE_CXX_FLAGS="-malign-double" \
-DCMAKE_Fortran_FLAGS_DEBUG="-g3 -ffpe-trap='zero,overflow' -fbacktrace" \
Expand Down
125 changes: 64 additions & 61 deletions src/korc_collisions.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ subroutine initialize_collision_params(params,spp,P,F,init)
!write(6,*) 'Ec_min',cparams_ms%Ec_min

cparams_ss%avalanche=.TRUE.
if (TRIM(params%collisions_model).eq.'NO_BOUND') then
if (TRIM(params%bound_electron_model).eq.'NO_BOUND') then
if (abs(F%Eo).lt.cparams_ss%Ec) then
cparams_ss%avalanche=.FALSE.
end if
Expand All @@ -598,7 +598,7 @@ subroutine initialize_collision_params(params,spp,P,F,init)

if (cparams_ss%avalanche) then

if (TRIM(params%collisions_model).eq.'NO_BOUND') then
if (TRIM(params%bound_electron_model).eq.'NO_BOUND') then
p_crit=1/sqrt(abs(F%Eo)/cparams_ss%Ec-1._rp)
else
p_crit=1/sqrt(abs(F%Eo)/cparams_ms%Ec_min-1._rp)
Expand All @@ -618,7 +618,7 @@ subroutine initialize_collision_params(params,spp,P,F,init)
end if

cparams_ss%avalanche=.TRUE.
if (TRIM(params%collisions_model).eq.'NO_BOUND') then
if (TRIM(params%bound_electron_model).eq.'NO_BOUND') then
if ((abs(maxEinterp).lt.cparams_ss%Ec).and. &
(abs(minEinterp).lt.cparams_ss%Ec)) &
cparams_ss%avalanche=.FALSE.
Expand All @@ -635,14 +635,14 @@ subroutine initialize_collision_params(params,spp,P,F,init)
if (cparams_ss%avalanche) then

if (abs(maxEinterp).gt.abs(minEinterp)) then
if (TRIM(params%collisions_model).eq.'NO_BOUND') then
if (TRIM(params%bound_electron_model).eq.'NO_BOUND') then
p_crit=1/sqrt(abs(maxEinterp)/cparams_ss%Ec-1._rp)
else

p_crit=1/sqrt(abs(maxEinterp)/cparams_ms%Ec_min-1._rp)
end if
else
if (TRIM(params%collisions_model).eq.'NO_BOUND') then
if (TRIM(params%bound_electron_model).eq.'NO_BOUND') then
p_crit=1/sqrt(abs(minEinterp)/cparams_ss%Ec-1._rp)
else
p_crit=1/sqrt(abs(minEinterp)/cparams_ms%Ec_min-1._rp)
Expand Down Expand Up @@ -702,7 +702,7 @@ subroutine initialize_collision_params(params,spp,P,F,init)
end if
endif

if (TRIM(params%collisions_model).eq.'NO_BOUND') then
if (TRIM(params%bound_electron_model).eq.'NO_BOUND') then
write(output_unit_write,*) 'E_CH is: ',cparams_ss%Ec*params%cpp%Eo,'V/m'
else
write(output_unit_write,*) 'E_CH is: ',cparams_ms%Ec_min*params%cpp%Eo,'V/m'
Expand All @@ -720,7 +720,7 @@ subroutine initialize_collision_params(params,spp,P,F,init)
end if
end if

if (TRIM(params%collisions_model).eq.'NO_BOUND') then
if (TRIM(params%bound_electron_model).eq.'NO_BOUND') then
write(output_unit_write,*) 'E_CH is: ',cparams_ss%Ec,'V/m'
else
write(output_unit_write,*) 'E_CH is: ',cparams_ms%Ec_min,'V/m'
Expand All @@ -745,7 +745,7 @@ subroutine initialize_collision_params(params,spp,P,F,init)
end if
end if

if (TRIM(params%collisions_model).eq.'NO_BOUND') then
if (TRIM(params%bound_electron_model).eq.'NO_BOUND') then
write(output_unit_write,*) 'E_CH is: ',cparams_ss%Ec*params%cpp%Eo,'V/m'
else
write(output_unit_write,*) 'E_CH is: ',cparams_ms%Ec_min*params%cpp%Eo,'V/m'
Expand All @@ -763,7 +763,7 @@ subroutine initialize_collision_params(params,spp,P,F,init)
end if
end if

if (TRIM(params%collisions_model).eq.'NO_BOUND') then
if (TRIM(params%bound_electron_model).eq.'NO_BOUND') then
write(output_unit_write,*) 'E_CH is: ',cparams_ss%Ec,'V/m'
else
write(output_unit_write,*) 'E_CH is: ',cparams_ms%Ec_min,'V/m'
Expand Down Expand Up @@ -943,7 +943,7 @@ subroutine define_collisions_time_step(params,F,init)
TYPE(FIELDS), INTENT(IN) :: F
LOGICAL, INTENT(IN) :: init
INTEGER(ip) :: iterations
REAL(rp) :: E,E_min
REAL(rp) :: E,E_min,KE_min
REAL(rp) :: v
REAL(rp) :: Tau
REAL(rp), DIMENSION(3) :: nu
Expand All @@ -958,6 +958,8 @@ subroutine define_collisions_time_step(params,F,init)
params%cpp%mass*params%cpp%velocity* &
C_C)**2+(C_ME*C_C**2)**2)

KE_min=E_min-C_ME*C_C**2

!write(6,'("E_min (MeV)",E17.10)') E/(10**6*C_E)
!write(6,'("E_min (MeV)",E17.10)') E_min/(10**6*C_E)

Expand Down Expand Up @@ -1032,6 +1034,7 @@ subroutine define_collisions_time_step(params,F,init)
write(output_unit_write,'("* * * * * * * * * * * SUBCYCLING FOR &
COLLISIONS * * * * * * * * * * *")')

write(output_unit_write,'("Minimum energy for collision: ",E17.10," eV")') KE_min/C_E
write(output_unit_write,'("Slowing down freqency (CF): ",E17.10)') &
nu(1)/params%cpp%time
write(output_unit_write,'("Pitch angle scattering freqency (CB): ",E17.10)') &
Expand Down Expand Up @@ -1987,20 +1990,22 @@ subroutine include_CoulombCollisions_FO_p(tt,params,random,X_X,X_Y,X_Z, &
! write(output_unit_write,'("phi: ",E17.10)') phi

CALL random%uniform%set(0.0_rp, 1.0_rp)
do cc=1_idef,pchunk

! uses C library to generate normal_distribution random variables,
! preserving parallelization where Fortran random number generator
! does not
rnd1(cc,1) = random%uniform%get()
rnd1(cc,2) = random%uniform%get()
rnd1(cc,3) = random%uniform%get()
enddo

!$OMP SIMD
! !$OMP& aligned(rnd1,dW,CAL,dCAL,CFL,CBL,vm,ne,Te,Zeff,dpm, &
! !$OMP& flagCon,flagCol,dxi,xi,pm,dphi,um,Ub_X,Ub_Y,Ub_Z,U_X,U_Y,U_Z, &
! !$OMP& b1_X,b1_Y,b1_Z,b2_X,b2_Y,b2_Z,b3_X,b3_Y,b3_Z)
do cc=1_idef,pchunk

! uses C library to generate normal_distribution random variables,
! preserving parallelization where Fortran random number generator
! does not
rnd1(cc,1) = random%uniform%get()
rnd1(cc,2) = random%uniform%get()
rnd1(cc,3) = random%uniform%get()

dW(cc,1) = SQRT(3*dt)*(-1+2*rnd1(cc,1))
dW(cc,2) = SQRT(3*dt)*(-1+2*rnd1(cc,2))
dW(cc,3) = SQRT(3*dt)*(-1+2*rnd1(cc,3))
Expand Down Expand Up @@ -2144,8 +2149,6 @@ subroutine include_CoulombCollisions_FOfio_p(tt,params,random,X_X,X_Y,X_Z, &

pchunk=params%pchunk

CALL random%uniform%set(0.0_rp,1.0_rp)

if (MODULO(params%it+tt,cparams_ss%subcycling_iterations) .EQ. 0_ip) then
dt = REAL(cparams_ss%subcycling_iterations,rp)*params%dt
time=params%init_time+(params%it-1+tt)*params%dt
Expand Down Expand Up @@ -2204,19 +2207,23 @@ subroutine include_CoulombCollisions_FOfio_p(tt,params,random,X_X,X_Y,X_Z, &

! write(output_unit_write,'("phi: ",E17.10)') phi

CALL random%uniform%set(0.0_rp, 1.0_rp)
do cc=1_idef,pchunk

! uses C library to generate normal_distribution random variables,
! preserving parallelization where Fortran random number generator
! does not
rnd1(cc,1) = random%uniform%get()
rnd1(cc,2) = random%uniform%get()
rnd1(cc,3) = random%uniform%get()
end do

!$OMP SIMD
! !$OMP& aligned(rnd1,dW,CAL,dCAL,CFL,CBL,vm,ne,Te,Zeff,nimp,dpm, &
! !$OMP& flagCon,flagCol,dxi,xi,pm,dphi,um,Ub_X,Ub_Y,Ub_Z,U_X,U_Y,U_Z, &
! !$OMP& b1_X,b1_Y,b1_Z,b2_X,b2_Y,b2_Z,b3_X,b3_Y,b3_Z)
do cc=1_idef,pchunk

! uses C library to generate normal_distribution random variables,
! preserving parallelization where Fortran random number generator
! does not
rnd1(cc,1) = random%uniform%get()
rnd1(cc,2) = random%uniform%get()
rnd1(cc,3) = random%uniform%get()

dW(cc,1) = SQRT(3*dt)*(-1+2*rnd1(cc,1))
dW(cc,2) = SQRT(3*dt)*(-1+2*rnd1(cc,2))
dW(cc,3) = SQRT(3*dt)*(-1+2*rnd1(cc,3))
Expand Down Expand Up @@ -2391,8 +2398,16 @@ subroutine include_CoulombCollisions_GC_p(tt,params,random,Y_R,Y_PHI,Y_Z, &
E_PHI_tmp=E_PHI
if (.not.params%FokPlan) E_PHI=0._rp

CALL random%uniform%set(0.0_rp, 1.0_rp)

do cc=1_idef,pchunk

rnd1(cc,1) = random%uniform%get()
rnd1(cc,2) = random%uniform%get()

enddo

!$OMP SIMD
! !$OMP& aligned (pm,xi,v,Ppll,Bmag,Pmu)
do cc=1_idef,pchunk
Bmag(cc)=sqrt(B_R(cc)*B_R(cc)+B_PHI(cc)*B_PHI(cc)+B_Z(cc)*B_Z(cc))
! Transform p_pll,mu to P,eta
Expand All @@ -2403,26 +2418,14 @@ subroutine include_CoulombCollisions_GC_p(tt,params,random,Y_R,Y_PHI,Y_Z, &

v(cc) = pm(cc)/gam(cc)
! normalized speed (v_K=v_P/c)
end do
!$OMP END SIMD

! write(output_unit_write,'("ne: "E17.10)') ne
! write(output_unit_write,'("Te: "E17.10)') Te
! write(output_unit_write,'("Bmag: "E17.10)') Bmag
! write(output_unit_write,'("v: ",E17.10)') v
! write(output_unit_write,'("xi: ",E17.10)') xi
! write(output_unit_write,'("ne: "E17.10)') ne
! write(output_unit_write,'("Te: "E17.10)') Te
! write(output_unit_write,'("Bmag: "E17.10)') Bmag
! write(output_unit_write,'("v: ",E17.10)') v
! write(output_unit_write,'("xi: ",E17.10)') xi
! write(output_unit_write,'("size(E_PHI_GC): ",I16)') size(E_PHI)

CALL random%uniform%set(0.0_rp, 1.0_rp)

!$OMP SIMD
! !$OMP& aligned(rnd1,dW,CAL,dCAL,CFL,CBL,v,ne,Te,Zeff,dp, &
! !$OMP& flagCon,flagCol,dxi,xi,pm,Ppll,Pmu,Bmag)
do cc=1_idef,pchunk

rnd1(cc,1) = random%uniform%get()
rnd1(cc,2) = random%uniform%get()

dW(cc,1) = SQRT(3*dt)*(-1+2*rnd1(cc,1))
dW(cc,2) = SQRT(3*dt)*(-1+2*rnd1(cc,2))

Expand Down Expand Up @@ -2674,6 +2677,14 @@ subroutine include_CoulombCollisionsLA_GC_p(spp,achunk,tt,params,random, &
E_PHI_LAC=E_PHI
if (.not.params%FokPlan) E_PHI=0._rp

CALL random%uniform%set(0.0_rp, 1.0_rp)

do cc=1_idef,achunk

rnd1(cc,1) = random%uniform%get()
rnd1(cc,2) = random%uniform%get()
enddo

!$OMP SIMD
! !$OMP& aligned (pm,xi,v,Ppll,Bmag,Pmu)
do cc=1_idef,achunk
Expand All @@ -2688,8 +2699,6 @@ subroutine include_CoulombCollisionsLA_GC_p(spp,achunk,tt,params,random, &

v(cc) = pm(cc)/gam(cc)
! normalized speed (v_K=v_P/c)
end do
!$OMP END SIMD

! write(output_unit_write,'("ne: "E17.10)') ne
! write(output_unit_write,'("Te: "E17.10)') Te
Expand All @@ -2698,16 +2707,6 @@ subroutine include_CoulombCollisionsLA_GC_p(spp,achunk,tt,params,random, &
! write(output_unit_write,'("xi: ",E17.10)') xi
! write(output_unit_write,'("size(E_PHI_GC): ",I16)') size(E_PHI)

CALL random%uniform%set(0.0_rp, 1.0_rp)

!$OMP SIMD
! !$OMP& aligned(rnd1,dW,CAL,dCAL,CFL,CBL,v,ne,Te,Zeff,dp, &
! !$OMP& flagCon,flagCol,dxi,xi,pm,Ppll,Pmu,Bmag)
do cc=1_idef,achunk

rnd1(cc,1) = random%uniform%get()
rnd1(cc,2) = random%uniform%get()

dW(cc,1) = SQRT(3*dt)*(-1+2*rnd1(cc,1))
dW(cc,2) = SQRT(3*dt)*(-1+2*rnd1(cc,2))

Expand Down Expand Up @@ -3129,13 +3128,16 @@ subroutine include_CoulombCollisions_GCfio_p(tt,params,random,Y_R,Y_PHI,Y_Z, &
! write(output_unit_write,'("xi: ",E17.10)') xi
! write(output_unit_write,'("size(E_PHI_GC): ",I16)') size(E_PHI)

CALL random%uniform%set(0.0_rp, 1.0_rp)
do cc=1_idef,pchunk
rnd1(cc,1) = random%uniform%get()
rnd1(cc,2) = random%uniform%get()
end do

!$OMP SIMD
! !$OMP& aligned(rnd1,dW,CAL,dCAL,CFL,CBL,v,ne,Te,Zeff,dp, &
! !$OMP& flagCon,flagCol,dxi,xi,pm,Ppll,Pmu,Bmag)
do cc=1_idef,pchunk
rnd1(cc,1) = random%uniform%get()
rnd1(cc,2) = random%uniform%get()

dW(cc,1) = SQRT(3*dt)*(-1+2*rnd1(cc,1))
dW(cc,2) = SQRT(3*dt)*(-1+2*rnd1(cc,2))
Expand Down Expand Up @@ -3333,6 +3335,10 @@ subroutine large_angle_source(spp,params,random,achunk,F,Y_R,Y_PHI,Y_Z, &
neta1=cparams_ss%ngrid1

CALL random%uniform%set(0.0_rp, 1.0_rp)
do cc=1_idef,achunk
prob0(cc) = random%uniform%get()
end do


!$OMP SIMD
do cc=1_idef,achunk
Expand All @@ -3341,9 +3347,6 @@ subroutine large_angle_source(spp,params,random,achunk,F,Y_R,Y_PHI,Y_Z, &

gam(cc) = sqrt(1+pm(cc)*pm(cc))
gam0(cc)=gam(cc)

prob0(cc) = random%uniform%get()

end do
!$OMP END SIMD

Expand Down
2 changes: 1 addition & 1 deletion src/korc_coords.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ subroutine cart_to_cyl(X,Xcyl)
if (size(X,1).eq.1) then
ss = size(X,1)
else
if (X(2,1).eq.0) then
if ((X(2,1).eq.0).AND.(X(2,2).eq.0).and.(X(2,3).eq.0)) then
ss=1_idef
else
ss = size(X,1)
Expand Down
5 changes: 4 additions & 1 deletion src/korc_fields.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,8 @@ subroutine analytical_fields_GC_init(params,F,Y,E,B,gradB,curlb,flag,PSIp)
REAL(rp) :: rm,theta

!write(output_unit_write,'("Y: ",E17.10)') Y

!write(6,*) 'Y',Y

ss = SIZE(Y,1)

!$OMP PARALLEL DO FIRSTPRIVATE(ss) PRIVATE(pp,rm,Btmp,qprof,dRBR,dRBPHI, &
Expand Down Expand Up @@ -1030,6 +1031,8 @@ subroutine get_analytical_fields(params,vars,F)

call cart_to_cyl(vars%X,vars%Y)

!write(6,*) vars%X,vars%Y

call cyl_check_if_confined(F,vars%Y,vars%flagCon)

call analytical_fields_GC_init(params,F,vars%Y, vars%E, vars%B, &
Expand Down