Skip to content

Fix an OpenMP data race in flow_dep_bdy called from moist_tile_loop_2 in solve_em #2382

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
pp1457 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix an OpenMP data race in flow_dep_bdy called from moist_tile_loop_2 in solve_em #2382

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
15 changes: 12 additions & 3 deletions dyn_em/solve_em.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2494,9 +2494,19 @@ END SUBROUTINE CMAQ_DRIVER
#endif
BENCH_END(update_scal_tim)

ENDDO moist_tile_loop_2
!$OMP END PARALLEL DO

! Must stay in its own tile loop: flow_dep_bdy reads a fixed global row,
! field(i_inner,k,jbe-spec_zone), that another tile may still be writing in
! rk_update_scalar. The barrier ending moist_tile_loop_2 makes it safe.

BENCH_START(flow_depbdy_tim)
IF( config_flags%specified .AND. ( .NOT. config_flags%have_bcs_moist ) ) THEN
IF(im .ne. P_QV)THEN
!$OMP PARALLEL DO &
!$OMP PRIVATE ( ij )
moist_tile_loop_3: DO ij = 1 , grid%num_tiles
CALL flow_dep_bdy ( moist(ims,kms,jms,im), &
grid%ru_m, grid%rv_m, config_flags, &
grid%spec_zone, &
Expand All @@ -2506,13 +2516,12 @@ END SUBROUTINE CMAQ_DRIVER
grid%i_start(ij), grid%i_end(ij), &
grid%j_start(ij), grid%j_end(ij), &
k_start, k_end )
ENDDO moist_tile_loop_3
!$OMP END PARALLEL DO
ENDIF
ENDIF
BENCH_END(flow_depbdy_tim)

ENDDO moist_tile_loop_2
!$OMP END PARALLEL DO

ENDIF !-- if (grid%adv_moist_cond .or. im==p_qv ) then

ENDDO moist_variable_loop
Expand Down