Skip to content

Fix mpp_gather/scatter memory leak #1892

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
abrooks1085 wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Fix mpp_gather/scatter memory leak #1892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0565f60
Add empty3d target for non-root gather/scatter calls
abrooks1085 Jun 11, 2026
f90f0e7
Merge branch 'NOAA-GFDL:main' into fix/mpp-gather-scatter-valgrind
abrooks1085 Jun 11, 2026
25fdcdf
Change test to pass unallocated arrays as arguements for pelist_scatt…
abrooks1085 Jun 11, 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
7 changes: 5 additions & 2 deletions mpp/include/mpp_gather.fh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,15 @@ subroutine MPP_GATHER_PELIST_GEN_2D_(is, ie, js, je, pelist, array_seg, gather_d

MPP_TYPE_, pointer :: arr3D(:,:,:)
MPP_TYPE_, pointer :: data3D(:,:,:)
MPP_TYPE_, allocatable, target :: empty3D(:,:,:)

arr3D(1:size(array_seg,1),1:size(array_seg,2),1:1) => array_seg

if (is_root_pe) then
data3D(1:size(gather_data,1),1:size(gather_data,2),1:1) => gather_data
data3D(1:size(gather_data,1),1:size(gather_data,2),1:1) => gather_data
else
data3D => null()
allocate(empty3D(0,0,0))
data3D => empty3D
endif

call mpp_gather(is, ie, js, je, 1, pelist, arr3D, data3D, [dim_order, 3], is_root_pe, &
Expand Down
4 changes: 3 additions & 1 deletion mpp/include/mpp_scatter.fh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,14 @@ subroutine MPP_SCATTER_PELIST_GEN_2D_(is, ie, js, je, pelist, array_seg, input_d

MPP_TYPE_, pointer :: arr3D(:,:,:)
MPP_TYPE_, pointer :: data3D(:,:,:)
MPP_TYPE_, allocatable, target :: empty3D(:,:,:)

arr3D(1:size(array_seg,1),1:size(array_seg,2),1:1) => array_seg
if (is_root_pe) then
data3D(1:size(input_data,1),1:size(input_data,2),1:1) => input_data
else
data3D => null()
allocate(empty3D(0,0,0))
data3D => empty3D
endif

call mpp_scatter(is, ie, js, je, 1, pelist, arr3D, data3D, [dim_order, 3], is_root_pe)
Expand Down
2 changes: 0 additions & 2 deletions test_fms/mpp/test_mpp_pelist_gatscat_gen_ind.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,6 @@ subroutine alloc_field(field, dim_order, dims_logical, pe, root, is_global)
allocate(field(dims(dim_order(1)), &
dims(dim_order(2)), &
dims(dim_order(3))))
else
allocate(field(1,1,1))
endif
else
dims = dims_logical
Expand Down
Loading