Rename internal modules to mapl_<Name>_mod and enforce gridcomps use MAPL umbrella (#4958/#4959)#4962
Merged
atrayano merged 11 commits intoMay 22, 2026
Conversation
tclune
added
0 Diff
mathomp4
previously approved these changes
May 22, 2026
mathomp4
previously approved these changes
May 22, 2026
mathomp4
previously approved these changes
May 22, 2026
Replace direct use of internal mapl_* modules in gridcomps/ with use MAPL where those modules are already exported by the umbrella. Also fix scope bug: standalone setServices subroutines after end module need their own use MAPL for macro error handling. Also update github-workflow SKILL.md: develop is now the primary integration branch for all MAPL v3 work.
Add 16 modules to MAPL.F90 that gridcomps need but were missing from the umbrella: mapl_Generic, mapl_ComponentSpec, mapl_RestartHandler, mapl_ESMF_Time_Utilities, mapl_SimpleAlarm, mapl_StateItemImpl, MAPL_FieldPointerUtilities, MAPL_ExceptionHandling, MAPL_ISO8601_DateTime, mapl_EsmfRegridder, mapl_RegridderMethods, mapl_HConfigAs, MAPL_StringTemplate, MAPL_FileMetadataUtilsMod, mapl_OS, mapl_GridGetGlobal. mapl_GenericGridComp excluded (its public setServices conflicts with standalone setServices subroutines in gridcomp files). Update 30 gridcomp files to use MAPL instead of internal modules.
Add MAPL.GeomIO to MAPL umbrella CMake dependencies and expose mapl_geomio and mapl_CompressionSettings via MAPL.F90. Update 8 extdata/history gridcomp files to use MAPL. Issue #4959 external USE violations are now fully resolved. Only mapl_NominalOrbitsMod remains, which is internal to gridcomps/orbit/ and correctly left as-is.
MAPL_Constants is an umbrella module and should not be replaced with use MAPL. The replacement caused GET_TIME from MAPL_ISO8601_DateTime to conflict with the local GET_TIME subroutine in MAPL_NominalOrbitsMod.
Module was unused; file and CMake library target removed entirely.
Bulk rename of 446 internal module names from mapl_<Name>[Mod] to mapl_<Name>_mod convention. All use statements updated throughout the codebase. Test module definitions excluded.
…tils, HConfig_API, geomio, mp_utils, regridder_mgr
tclune
force-pushed
the
feature/issues-4958-4959-rename-modules-enforce-gridcomp-use
branch
from
89f691e to
1329a8b
Compare
Collaborator
Author
|
/rerun |
Remove accidentally committed files: MAPL_v3_restructuring.pptx, PET0.ESMF_LogFile, base_modules.csv, base_modules.xls, omp_master_reproducer.F90, rename_modules.py, reproducer_debug, reproducer_opt, tilegrid.F90
atrayano
approved these changes
May 22, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
mapl_<Name>[Mod]→mapl_<Name>_modconvention across 446 module definitions and 695+ source files (Rename all internal modules to mapl_<Name>_mod convention #4958)MAPL_GridCompsModentirely and enforces thatgridcomps/modulesuse MAPL(the umbrella) rather than internal modules directly (Enforce that gridcomp modules only USE MAPL (not internal low-level modules) #4959)mapl_ErrorHandlingMod,mapl_KeywordEnforcerMod,MAPL_ShmemModVerticalAlignment.F90fromsuperstructure/generic/specs/(canonical copy ininfrastructure/vertical/vertical_grid/).pftest files and test helper modules to use updated module namesbase3g/Comms.F90retains legacyMAPL_CommsModname pending base3g/Comms.F90 retains legacy MAPL_CommsMod name — should be renamed to mapl_Comms_mod or deprecated #4961Related Issues
Closes #4958
Closes #4959
See also #4961