Skip to content
Draft
Changes from all commits
Commits
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
19 changes: 8 additions & 11 deletions src/core_atmosphere/dynamics/mpas_atm_time_integration.F
Original file line number Diff line number Diff line change
Expand Up @@ -5477,7 +5477,7 @@ subroutine atm_advance_scalars_mono_work(field_name, block, state, nCells, nEdge
!$acc end parallel

!$OMP BARRIER

call mpas_timer_start('atm_advance_scalars_mono_work_5481')
!$acc parallel

!
Expand Down Expand Up @@ -5519,11 +5519,11 @@ subroutine atm_advance_scalars_mono_work(field_name, block, state, nCells, nEdge
end do

end do

!$acc end parallel
!
! horizontal flux divergence for upwind update
!

!$acc parallel
! upwind flux computation
!$acc loop gang worker
do iEdge=edgeStart,edgeEnd
Expand All @@ -5536,20 +5536,17 @@ subroutine atm_advance_scalars_mono_work(field_name, block, state, nCells, nEdge
flux_upwind_tmp(k,iEdge) = dvEdge(iEdge) * dt * &
(max(0.0_RKIND,uhAvg(k,iEdge))*scalar_old(k,cell1) + min(0.0_RKIND,uhAvg(k,iEdge))*scalar_old(k,cell2))
flux_tmp(k,iEdge) = dt * flux_arr(k,iEdge) - flux_upwind_tmp(k,iEdge)
end do

if( config_apply_lbcs .and. (bdyMaskEdge(iEdge) == nRelaxZone) .or. (bdyMaskEdge(iEdge) == nRelaxZone-1) ) then
!$acc loop vector
do k=1,nVertLevels

if( config_apply_lbcs .and. (bdyMaskEdge(iEdge) == nRelaxZone) .or. (bdyMaskEdge(iEdge) == nRelaxZone-1) ) then
flux_tmp(k,iEdge) = 0.0_RKIND
flux_arr(k,iEdge) = flux_upwind_tmp(k,iEdge)
end do
end if
end if
end do

end do

!$acc end parallel

call mpas_timer_stop('atm_advance_scalars_mono_work_5481')
!$OMP BARRIER

!$acc parallel
Expand Down