Skip to content

Optimize ACC port of atm_advance_acoustic_step_work:3976 #1512

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

Draft
abishekg7 wants to merge 6 commits into
base: develop
Choose a base branch
from
+39 −15
Draft

Optimize ACC port of atm_advance_acoustic_step_work:3976 #1512

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
420c339
Add timers
abishekg7 Aug 21, 2026
d29206d
Opt 1 - split loops
abishekg7 Aug 25, 2026
2206c22
Opt 1 + macros
abishekg7 Aug 27, 2026
166ef88
quick fix
abishekg7 Aug 27, 2026
26098ef
Opt 2 + macro
abishekg7 Aug 28, 2026
2c8a236
Opt 3
abishekg7 Sep 8, 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
54 changes: 39 additions & 15 deletions src/core_atmosphere/dynamics/mpas_atm_time_integration.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,17 @@
#ifdef MPAS_OPENACC
#define MPAS_ACC_TIMER_START(X) call mpas_timer_start(X)
#define MPAS_ACC_TIMER_STOP(X) call mpas_timer_stop(X)
#define RHO_PP(i,j) rho_pp(i, j)
#define RTHETA_PP(i,j) rtheta_pp(i, j)
#define GPU_LOOP() do i=1,nEdgesOnCell(iCell)
#define CPU_LOOP()
#else
#define MPAS_ACC_TIMER_START(X)
#define MPAS_ACC_TIMER_STOP(X)
#define RHO_PP(i,j) rs(i)
#define RTHETA_PP(i,j) ts(i)
#define CPU_LOOP() do i=1,nEdgesOnCell(iCell)
#define GPU_LOOP()
#endif

module atm_time_integration
Expand Down Expand Up @@ -3972,7 +3980,7 @@ subroutine atm_advance_acoustic_step_work(nCells, nEdges, nCellsSolve, cellStart
end if

!$OMP BARRIER

call mpas_timer_start('atm_advance_acoustic_step_3976')
!$acc parallel default(present)
!$acc loop gang worker private(ts,rs)
do iCell=cellSolveStart,cellSolveEnd ! loop over all owned cells to solve
Expand All @@ -3997,14 +4005,17 @@ subroutine atm_advance_acoustic_step_work(nCells, nEdges, nCellsSolve, cellStart
rs(k) = 0.0
end do

!$acc loop seq
do i=1,nEdgesOnCell(iCell)
iEdge = edgesOnCell(i,iCell)
cell1 = cellsOnEdge(1,iEdge)
cell2 = cellsOnEdge(2,iEdge)

CPU_LOOP()
!DIR$ IVDEP
!$acc loop vector
do k=1,nVertLevels
!$acc loop seq
GPU_LOOP()

iEdge = edgesOnCell(i,iCell)
cell1 = cellsOnEdge(1,iEdge)
cell2 = cellsOnEdge(2,iEdge)
flux = edgesOnCell_sign(i,iCell)*dts*dvEdge(iEdge)*ru_p(k,iEdge) * invAreaCell(iCell)
rs(k) = rs(k)-flux
ts(k) = ts(k)-flux*0.5*(theta_m(k,cell2)+theta_m(k,cell1))
Expand Down Expand Up @@ -4046,8 +4057,25 @@ subroutine atm_advance_acoustic_step_work(nCells, nEdges, nCellsSolve, cellStart
+ cofwt(k-1,iCell)*(etp(k-1)*ts(k-1)+etm(k-1)*rtheta_pp(k-1,iCell)))
end do

! tridiagonal solve sweeping up and then down the column
#ifdef MPAS_OPENACC
!$acc loop vector
do k=1,nVertLevels
rho_pp(k,iCell) = rs(k)
rtheta_pp(k,iCell) = ts(k)
end do

end if
enddo
!$acc end parallel


!$acc parallel default(present)
!$acc loop gang worker
do iCell=cellSolveStart,cellSolveEnd ! loop over all owned cells to solve

if(specZoneMaskCell(iCell) == 0.0) then ! not specified zone, compute...
#endif
! tridiagonal solve sweeping up and then down the column
!MGD VECTOR DEPENDENCE
!$acc loop seq
do k=2,nVertLevels
Expand All @@ -4070,12 +4098,8 @@ subroutine atm_advance_acoustic_step_work(nCells, nEdges, nCellsSolve, cellStart
*(fzm(k)*rho_zz(k,iCell)+fzp(k)*rho_zz(k-1,iCell)) &
*w(k,iCell) )/(1.0+dts*dss(k,iCell)) &
- (rw_save(k ,iCell) - rw(k ,iCell))
end do


! accumulate (rho*omega)' for use later in scalar transport
!DIR$ IVDEP
!$acc loop vector
do k=2,nVertLevels
wwAvg(k,iCell) = wwAvg(k,iCell) + ewp(k)*rw_p(k,iCell)
end do

Expand All @@ -4084,9 +4108,9 @@ subroutine atm_advance_acoustic_step_work(nCells, nEdges, nCellsSolve, cellStart
!DIR$ IVDEP
!$acc loop vector
do k=1,nVertLevels
rho_pp(k,iCell) = rs(k) - dts*cofrz(k) *( ewp(k+1)*rw_p(k+1,iCell) &
rho_pp(k,iCell) = RHO_PP(k,iCell) - dts*cofrz(k) *( ewp(k+1)*rw_p(k+1,iCell) &
-ewp(k )*rw_p(k ,iCell))
rtheta_pp(k,iCell) = ts(k) - dts*rdzw(k)*( ewp(k+1)*coftz(k+1,iCell)*rw_p(k+1,iCell) &
rtheta_pp(k,iCell) = RTHETA_PP(k,iCell) - dts*rdzw(k)*( ewp(k+1)*coftz(k+1,iCell)*rw_p(k+1,iCell) &
-ewp(k )*coftz(k ,iCell)*rw_p(k ,iCell))
end do

Expand All @@ -4104,7 +4128,7 @@ subroutine atm_advance_acoustic_step_work(nCells, nEdges, nCellsSolve, cellStart

end do ! end of loop over cells
!$acc end parallel

call mpas_timer_stop('atm_advance_acoustic_step_3976')

end subroutine atm_advance_acoustic_step_work

Expand Down