Skip to content

Fixed some OpenACC directives #859

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
merged 1 commit into from
Jun 5, 2025
Merged

Fixed some OpenACC directives #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions src/common/m_finite_differences.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ contains
integer :: x, y, z !< Generic loop iterators

real(wp) :: divergence

!$acc parallel loop collapse(3) private(divergence)
!$acc parallel loop collapse(3) gang vector default(present) private(divergence)
do x = ix_s%beg, ix_s%end
do y = iy_s%beg, iy_s%end
do z = iz_s%beg, iz_s%end
Expand Down
2 changes: 1 addition & 1 deletion src/simulation/m_hypoelastic.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ contains

if (n == 0) then
l = 0; q = 0
!$acc parallel loop collapse(1) gang vector default(present)
!$acc parallel loop gang vector default(present)
do k = 0, m
rhs_vf(damage_idx)%sf(k, l, q) = (alpha_bar*max(abs(q_cons_vf(stress_idx%beg)%sf(k, l, q)) - tau_star, 0._wp))**cont_damage_s
end do
Expand Down
6 changes: 3 additions & 3 deletions src/simulation/m_surface_tension.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ contains
!$acc update device(is1, is2, is3, iv)

if (recon_dir == 1) then
!$acc parallel loop collapse(4) default(present)
!$acc parallel loop collapse(4) gang vector default(present)
do i = iv%beg, iv%end
do l = is3%beg, is3%end
do k = is2%beg, is2%end
Expand All @@ -349,7 +349,7 @@ contains
end do
!$acc end parallel loop
else if (recon_dir == 2) then
!$acc parallel loop collapse(4) default(present)
!$acc parallel loop collapse(4) gang vector default(present)
do i = iv%beg, iv%end
do l = is3%beg, is3%end
do k = is2%beg, is2%end
Expand All @@ -362,7 +362,7 @@ contains
end do
!$acc end parallel loop
else if (recon_dir == 3) then
!$acc parallel loop collapse(4) default(present)
!$acc parallel loop collapse(4) gang vector default(present)
do i = iv%beg, iv%end
do l = is3%beg, is3%end
do k = is2%beg, is2%end
Expand Down
4 changes: 2 additions & 2 deletions src/simulation/m_viscous.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@ contains
end do

if (n > 0) then
!$acc parallel loop collapse(3) gang vector
!$acc parallel loop collapse(3) gang vector default(present)
do l = is3_viscous%beg, is3_viscous%end
do k = is2_viscous%beg, is2_viscous%end
do j = is1_viscous%beg, is1_viscous%end
Expand All @@ -1342,7 +1342,7 @@ contains
end if

if (p > 0) then
!$acc parallel loop collapse(3) gang vector
!$acc parallel loop collapse(3) gang vector default(present)
do l = is3_viscous%beg, is3_viscous%end
do k = is2_viscous%beg, is2_viscous%end
do j = is1_viscous%beg, is1_viscous%end
Expand Down
6 changes: 3 additions & 3 deletions src/simulation/m_weno.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ contains

if (weno_order == 1) then
if (weno_dir == 1) then
!$acc parallel loop collapse(4) default(present)
!$acc parallel loop collapse(4) gang vector default(present)
do i = 1, ubound(v_vf, 1)
do l = is3_weno%beg, is3_weno%end
do k = is2_weno%beg, is2_weno%end
Expand All @@ -686,7 +686,7 @@ contains
end do
!$acc end parallel loop
else if (weno_dir == 2) then
!$acc parallel loop collapse(4) default(present)
!$acc parallel loop collapse(4) gang vector default(present)
do i = 1, ubound(v_vf, 1)
do l = is3_weno%beg, is3_weno%end
do k = is2_weno%beg, is2_weno%end
Expand All @@ -699,7 +699,7 @@ contains
end do
!$acc end parallel loop
else if (weno_dir == 3) then
!$acc parallel loop collapse(4) default(present)
!$acc parallel loop collapse(4) gang vector default(present)
do i = 1, ubound(v_vf, 1)
do l = is3_weno%beg, is3_weno%end
do k = is2_weno%beg, is2_weno%end
Expand Down
Loading