Skip to content

Generalized indices: mpp global field updates #1806

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
J-Lentz wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Generalized indices: mpp global field updates #1806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4b9d897
Add unit tests for generalized indices
Sep 3, 2025
dbe5f5b
Break up long lines
Sep 4, 2025
2b48872
mpp_*_group_update tests with generalized indices
Sep 12, 2025
2bf6220
interpolator generalized indices tests
Oct 6, 2025
7819072
2D generalized indices tests for data_override
Oct 7, 2025
39dbf83
Tentative mpp_global_field updates
Dec 9, 2025
2e52375
Update mpp_global_field unit tests
Dec 11, 2025
572f48c
Move packing/unpacking routines into new file
Dec 15, 2025
2ddef53
Merge remote-tracking branch 'origin/main' into general_indices_mpp_g…
Jan 20, 2026
86abf41
Split long line
Jan 20, 2026
348d123
Merge remote-tracking branch 'origin/main' into general_indices_mpp_g…
Apr 2, 2026
8132eea
Workaround for GFortran bug
Apr 2, 2026
f42babd
Improve documentation
Apr 9, 2026
549d1fd
Add target attribute to `mpp_domains_stack` in non-MPI build
Apr 9, 2026
ddea957
Attempt to fix CMake build
Apr 9, 2026
5a8f60f
Fix CMake build: Attempt 2
Apr 9, 2026
9ab20fc
Fix CMake build: Attempt 3
Apr 9, 2026
c95f694
Use permute_arr in mpp_global_field tests
Apr 9, 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
24 changes: 12 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@uramirez8707 uramirez8707 Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are the changes in CMakeLists necessary?

Copy link
Copy Markdown
Contributor Author

@J-Lentz J-Lentz Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They're not necessary. I did some back-and-forth with Gemini trying to determine the cause of a CI build failure and while none of its suggestions ended up being the actual issue, they do seem like genuine improvements, so I kept them in the PR. I can git revert CMakeLists if anyone disagrees.

Original file line number Diff line number Diff line change
Expand Up @@ -880,40 +880,40 @@ if(UNIT_TESTS)
get_filename_component (TName ${testFile} NAME_WE)

add_executable(${TName}_r8 ${testFile})
target_compile_definitions(${TName}_r8 PRIVATE "${r8_defs}")
target_compile_definitions(${TName}_r8 PRIVATE "${r8_defs} ${fms_defs}")
set_target_properties(${TName}_r8 PROPERTIES COMPILE_FLAGS ${r8_flags})
target_link_libraries(${TName}_r8 PUBLIC FMS::fms
target_link_libraries(${TName}_r8 PUBLIC ${fmsLibraryName}
PRIVATE testLibs
)

add_executable(${TName}_r4 ${testFile})
target_compile_definitions(${TName}_r4 PRIVATE "${r4_defs}")
target_compile_definitions(${TName}_r4 PRIVATE "${r4_defs} ${fms_defs}")
# seems counterintuitive but r4 tests use r8 default
# they specify kind values explicitly with the preprocessor where needed (TEST_FMS_KIND_)
set_target_properties(${TName}_r4 PROPERTIES COMPILE_FLAGS ${r8_flags})
target_link_libraries(${TName}_r4 PUBLIC FMS::fms
target_link_libraries(${TName}_r4 PUBLIC ${fmsLibraryName}
PRIVATE testLibs
)

add_executable(${TName}_i8 ${testFile})
target_compile_definitions(${TName}_i8 PRIVATE "${r8_defs}")
target_compile_definitions(${TName}_i8 PRIVATE "${r8_defs} ${fms_defs}")
set_target_properties(${TName}_i8 PROPERTIES COMPILE_FLAGS ${r8_flags})
target_link_libraries(${TName}_i8 PUBLIC FMS::fms
target_link_libraries(${TName}_i8 PUBLIC ${fmsLibraryName}
PRIVATE testLibs
)

add_executable(${TName}_i4 ${testFile})
target_compile_definitions(${TName}_i4 PRIVATE "${r8_defs}")
target_compile_definitions(${TName}_i4 PRIVATE "${r8_defs} ${fms_defs}")
set_target_properties(${TName}_i4 PROPERTIES COMPILE_FLAGS ${r8_flags})
target_link_libraries(${TName}_i4 PUBLIC FMS::fms
target_link_libraries(${TName}_i4 PUBLIC ${fmsLibraryName}
PRIVATE testLibs
)

if(WITH_YAML)
target_link_libraries(${TName}_r4 PRIVATE yaml ${LIBYAML_LIBRARIES})
target_link_libraries(${TName}_r8 PRIVATE yaml ${LIBYAML_LIBRARIES})
target_link_libraries(${TName}_i4 PRIVATE yaml ${LIBYAML_LIBRARIES})
target_link_libraries(${TName}_i8 PRIVATE yaml ${LIBYAML_LIBRARIES})
target_link_libraries(${TName}_r4 PRIVATE PkgConfig::YAML)
target_link_libraries(${TName}_r8 PRIVATE PkgConfig::YAML)
target_link_libraries(${TName}_i4 PRIVATE PkgConfig::YAML)
target_link_libraries(${TName}_i8 PRIVATE PkgConfig::YAML)
endif()

if(OPENMP)
Expand Down
10 changes: 7 additions & 3 deletions mpp/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ libmpp_la_SOURCES = \
include/mpp_do_checkV.fh \
include/mpp_do_get_boundary.fh \
include/mpp_do_get_boundary_ad.fh \
include/mpp_do_global_field.fh \
include/mpp_do_global_field_ad.fh \
include/mpp_do_redistribute.fh \
include/mpp_do_update.fh \
Expand Down Expand Up @@ -87,6 +86,8 @@ libmpp_la_SOURCES = \
include/mpp_global_sum_ad.fh \
include/mpp_global_sum_tl.fh \
include/mpp_group_update.fh \
include/mpp_pack.fh \
include/mpp_pack.inc \
include/mpp_read_2Ddecomp.fh \
include/mpp_read_compressed.fh \
include/mpp_read_distributed_ascii.fh \
Expand Down Expand Up @@ -151,6 +152,8 @@ mpp_mod.$(FC_MODEXT): \
include/mpp_type_nocomm.fh \
include/mpp_gather.fh \
include/mpp_scatter.fh \
include/mpp_pack.fh \
include/mpp_pack.inc \
include/system_clock.fh
mpp_data_mod.$(FC_MODEXT): \
mpp_parameter_mod.$(FC_MODEXT) \
Expand Down Expand Up @@ -193,7 +196,6 @@ mpp_domains_mod.$(FC_MODEXT): \
include/mpp_update_domains2D_nonblock.fh \
include/mpp_update_nest_domains.fh \
include/mpp_domains_reduce.inc \
include/mpp_do_global_field.fh \
include/mpp_do_global_field_ad.fh \
include/mpp_global_field.fh \
include/mpp_global_field_ad.fh \
Expand All @@ -203,7 +205,9 @@ mpp_domains_mod.$(FC_MODEXT): \
include/mpp_global_sum_tl.fh \
include/mpp_unstruct_domain.inc \
include/mpp_global_field_ug.fh \
include/mpp_unstruct_pass_data.fh
include/mpp_unstruct_pass_data.fh \
include/mpp_pack.fh \
include/mpp_pack.inc
mpp_efp_mod.$(FC_MODEXT): mpp_parameter_mod.$(FC_MODEXT) mpp_mod.$(FC_MODEXT)
mpp_memutils_mod.$(FC_MODEXT): mpp_mod.$(FC_MODEXT)
mpp_pset_mod.$(FC_MODEXT): mpp_mod.$(FC_MODEXT) gfdl_nompi_f08.$(FC_MODEXT)
Expand Down
4 changes: 2 additions & 2 deletions mpp/include/mpp_data_mpi.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ integer, parameter :: mpp_from_pe = -999, ptr_from = -999
!-------------------------------------------------------------------!
! The following data is used in mpp_domains_mod and its components !
!-------------------------------------------------------------------!
real(r8_kind), allocatable :: mpp_domains_stack(:) !< stack used to hold data for domain operations
real(r8_kind), allocatable :: mpp_domains_stack_nonblock(:) !< stack used for non-blocking domain operations
real(r8_kind), allocatable, target :: mpp_domains_stack(:) !< stack used to hold data for domain operations
real(r8_kind), allocatable, target :: mpp_domains_stack_nonblock(:) !< stack used for non-blocking domain operations
!--- some dummy variables with dummy values that will never be used
integer, parameter :: ptr_domains_stack = -999
integer, parameter :: ptr_domains_stack_nonblock = -999
4 changes: 2 additions & 2 deletions mpp/include/mpp_data_nocomm.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ integer, parameter :: mpp_from_pe = -999, ptr_from = -999
!-------------------------------------------------------------------!
! The following data is used in mpp_domains_mod and its components !
!-------------------------------------------------------------------!
real(r8_kind), allocatable :: mpp_domains_stack(:)
real(r8_kind), allocatable :: mpp_domains_stack_nonblock(:)
real(r8_kind), allocatable, target :: mpp_domains_stack(:)
real(r8_kind), allocatable, target :: mpp_domains_stack_nonblock(:)
!--- some dummy variables with dummy values that will never be used
integer, parameter :: ptr_domains_stack = -999
integer, parameter :: ptr_domains_stack_nonblock = -999
Loading
Loading