Skip to content

Fix for parallel reproducibility issue with 3d_smagorinsky #1445

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
abishekg7 wants to merge 2 commits into
base: release-v8.4.0
Choose a base branch
from
+27 −4
Open

Fix for parallel reproducibility issue with 3d_smagorinsky #1445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d72df90
Add new halo exchange group in mpas_atm_halos to exchange eddy viscos…
abishekg7 Apr 15, 2026
a6bc145
Adding halo exhanges for LES eddy viscosity fields in atm_compute_dyn…
abishekg7 Apr 15, 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
22 changes: 18 additions & 4 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 @@ -2254,7 +2254,8 @@ subroutine atm_srk3(domain, dt, itimestep, exchange_halo_group)
edgeThreadStart(thread), edgeThreadEnd(thread), &
cellSolveThreadStart(thread), cellSolveThreadEnd(thread), &
vertexSolveThreadStart(thread), vertexSolveThreadEnd(thread), &
edgeSolveThreadStart(thread), edgeSolveThreadEnd(thread))
edgeSolveThreadStart(thread), edgeSolveThreadEnd(thread), &
domain, config_gpu_aware_mpi, exchange_halo_group)
end do
!$OMP END PARALLEL DO

Expand Down Expand Up @@ -5787,7 +5788,8 @@ end subroutine atm_advance_scalars_mono_work

subroutine atm_compute_dyn_tend(tend, tend_physics, state, diag, mesh, diag_physics, configs, nVertLevels, rk_step, dynamics_substep, dt, &
cellStart, cellEnd, vertexStart, vertexEnd, edgeStart, edgeEnd, &
cellSolveStart, cellSolveEnd, vertexSolveStart, vertexSolveEnd, edgeSolveStart, edgeSolveEnd)
cellSolveStart, cellSolveEnd, vertexSolveStart, vertexSolveEnd, edgeSolveStart, edgeSolveEnd, &
domain, config_gpu_aware_mpi, exchange_halo_group)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Compute height and normal wind tendencies, as well as diagnostic variables
!
Expand Down Expand Up @@ -5820,6 +5822,9 @@ subroutine atm_compute_dyn_tend(tend, tend_physics, state, diag, mesh, diag_phys
real (kind=RKIND), intent(in) :: dt
integer, intent(in) :: cellStart, cellEnd, vertexStart, vertexEnd, edgeStart, edgeEnd
integer, intent(in) :: cellSolveStart, cellSolveEnd, vertexSolveStart, vertexSolveEnd, edgeSolveStart, edgeSolveEnd
type (domain_type), intent(inout) :: domain
logical, intent(in) :: config_gpu_aware_mpi
procedure (halo_exchange_routine) :: exchange_halo_group

!
! Local variables
Expand Down Expand Up @@ -6092,7 +6097,8 @@ subroutine atm_compute_dyn_tend(tend, tend_physics, state, diag, mesh, diag_phys
config_surface_heat_flux, config_surface_moisture_flux, config_surface_drag_coefficient, &
rthdynten, ustm, hfx, qfx, &
cellStart, cellEnd, vertexStart, vertexEnd, edgeStart, edgeEnd, &
cellSolveStart, cellSolveEnd, vertexSolveStart, vertexSolveEnd, edgeSolveStart, edgeSolveEnd)
cellSolveStart, cellSolveEnd, vertexSolveStart, vertexSolveEnd, edgeSolveStart, edgeSolveEnd, &
domain, config_gpu_aware_mpi, exchange_halo_group)

if (nopbl) then
deallocate(ustm)
Expand Down Expand Up @@ -6127,7 +6133,8 @@ subroutine atm_compute_dyn_tend_work(nCells, nEdges, nVertices, nVertLevels_dumm
config_surface_heat_flux, config_surface_moisture_flux, config_surface_drag_coefficient, &
rthdynten, ustm, hfx, qfx, &
cellStart, cellEnd, vertexStart, vertexEnd, edgeStart, edgeEnd, &
cellSolveStart, cellSolveEnd, vertexSolveStart, vertexSolveEnd, edgeSolveStart, edgeSolveEnd)
cellSolveStart, cellSolveEnd, vertexSolveStart, vertexSolveEnd, edgeSolveStart, edgeSolveEnd, &
domain, config_gpu_aware_mpi, exchange_halo_group)


use mpas_atm_dimensions
Expand Down Expand Up @@ -6266,6 +6273,9 @@ subroutine atm_compute_dyn_tend_work(nCells, nEdges, nVertices, nVertLevels_dumm
integer, intent(in) :: cellStart, cellEnd, vertexStart, vertexEnd, edgeStart, edgeEnd
integer, intent(in) :: cellSolveStart, cellSolveEnd, vertexSolveStart, vertexSolveEnd, edgeSolveStart, edgeSolveEnd

type (domain_type), intent(inout) :: domain
logical, intent(in) :: config_gpu_aware_mpi
procedure (halo_exchange_routine) :: exchange_halo_group

!
! Local variables
Expand Down Expand Up @@ -6385,6 +6395,10 @@ subroutine atm_compute_dyn_tend_work(nCells, nEdges, nVertices, nVertLevels_dumm
cellStart, cellEnd, nEdgesOnCell, edgesOnCell, cellsOnEdge, &
nCells, nEdges, nVertLevels, maxEdges, num_scalars )

!$acc update self(eddy_visc_horz, eddy_visc_vert) if (.not. config_gpu_aware_mpi)
call exchange_halo_group(domain, 'dynamics:eddy_visc_horz,eddy_visc_vert', config_gpu_aware_mpi)
!$acc update device(eddy_visc_horz, eddy_visc_vert) if (.not. config_gpu_aware_mpi)

end if

if (config_mpas_cam_coef > 0.0) then
Expand Down
9 changes: 9 additions & 0 deletions src/core_atmosphere/mpas_atm_halos.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ subroutine atm_build_halo_groups(domain, ierr)
call mpas_dmpar_exch_group_add_field(domain, 'dynamics:theta_m,pressure_p,rtheta_p', 'rtheta_p', &
timeLevel=1, haloLayers=(/1,2/))

call mpas_dmpar_exch_group_create(domain, 'dynamics:eddy_visc_horz,eddy_visc_vert')
call mpas_dmpar_exch_group_add_field(domain, 'dynamics:eddy_visc_horz,eddy_visc_vert', 'eddy_visc_horz', timeLevel=1, haloLayers=(/1,2/))
call mpas_dmpar_exch_group_add_field(domain, 'dynamics:eddy_visc_horz,eddy_visc_vert', 'eddy_visc_vert', timeLevel=1, haloLayers=(/1,2/))

call mpas_dmpar_exch_group_create(domain, 'dynamics:exner')
call mpas_dmpar_exch_group_add_field(domain, 'dynamics:exner', 'exner', timeLevel=1, haloLayers=(/1,2/))
Expand Down Expand Up @@ -243,6 +246,10 @@ subroutine atm_build_halo_groups(domain, ierr)
timeLevel=1, haloLayers=(/1,2/))
call mpas_halo_exch_group_complete(domain, 'dynamics:theta_m,pressure_p,rtheta_p')

call mpas_halo_exch_group_create(domain, 'dynamics:eddy_visc_horz,eddy_visc_vert')
call mpas_halo_exch_group_add_field(domain, 'dynamics:eddy_visc_horz,eddy_visc_vert', 'eddy_visc_horz', timeLevel=1, haloLayers=(/1,2/))
call mpas_halo_exch_group_add_field(domain, 'dynamics:eddy_visc_horz,eddy_visc_vert', 'eddy_visc_vert', timeLevel=1, haloLayers=(/1,2/))
call mpas_halo_exch_group_complete(domain, 'dynamics:eddy_visc_horz,eddy_visc_vert')

call mpas_halo_exch_group_create(domain, 'dynamics:exner')
call mpas_halo_exch_group_add_field(domain, 'dynamics:exner', 'exner', timeLevel=1, haloLayers=(/1,2/))
Expand Down Expand Up @@ -367,6 +374,7 @@ subroutine atm_destroy_halo_groups(domain, ierr)
call mpas_dmpar_exch_group_destroy(domain, 'dynamics:w,pv_edge,rho_edge,scalars')
call mpas_dmpar_exch_group_destroy(domain, 'dynamics:theta_m,pressure_p,rtheta_p')

call mpas_dmpar_exch_group_destroy(domain, 'dynamics:eddy_visc_horz,eddy_visc_vert')
call mpas_dmpar_exch_group_destroy(domain, 'dynamics:exner')
call mpas_dmpar_exch_group_destroy(domain, 'dynamics:tend_u')
call mpas_dmpar_exch_group_destroy(domain, 'dynamics:rho_pp')
Expand Down Expand Up @@ -403,6 +411,7 @@ subroutine atm_destroy_halo_groups(domain, ierr)
call mpas_halo_exch_group_destroy(domain, 'dynamics:w,pv_edge,rho_edge,scalars')
call mpas_halo_exch_group_destroy(domain, 'dynamics:theta_m,pressure_p,rtheta_p')

call mpas_halo_exch_group_destroy(domain, 'dynamics:eddy_visc_horz,eddy_visc_vert')
call mpas_halo_exch_group_destroy(domain, 'dynamics:exner')
call mpas_halo_exch_group_destroy(domain, 'dynamics:tend_u')
call mpas_halo_exch_group_destroy(domain, 'dynamics:rho_pp')
Expand Down