Remove base/ thin wrappers for FileIOSharedMod, NCIOMod, MAPL_LocStreamMod (closes #4874)#4883
Merged
Merged
Conversation
…amMod; move c_mapl_locstream_F.c to base3g/ (closes #4874)
…to base3g/ migrations
… pushing/opening a PR
tclune
added a commit
that referenced
this pull request
May 14, 2026
* Add TimeAccumulate with unit tests. * Add TimeAccumulate with unit tests. * Remove period calculation; fix update procedures * Move FileIOSharedMod, NCIOMod, MAPL_LocStreamMod to base3g/; re-export through MAPL umbrella (#4882) * Extend mapl3g_FileIO WRITE_PARALLEL with scalar/1d integer and real overloads (refs #4879) * Move FileIOSharedMod and NCIOMod to base3g/, re-export through MAPL umbrella (refs #4874, #4879) - Move FileIOShared.F90 and NCIO.F90 from base/ to base3g/ with temporary internal module names (mapl_FileIOShared, mapl_NCIO) - Leave thin compatibility wrappers in base/ under original module names (FileIOSharedMod, NCIOMod) so existing callers are unaffected - Copy write_parallel.H and read_parallel.H to base3g/include/ - Update base3g/CMakeLists.txt with new sources and dependencies - Re-export ArrDescr, ArrDescrInit, ArrDescrSet, MAPL_VarRead, MAPL_VarWrite, MAPL_NCIOGetFileType, MAPL_IOGetNonDimVars, MAPL_IOCountNonDimVars, MAPL_IOChangeRes, MAPL_IOCountLevels through mapl_base3g so they are available via 'use MAPL' * Move MAPL_LocStreamMod to base3g/ (module mapl_LocStreamMod_impl); leave thin wrapper in base/ (refs #4874) * Remove base/ thin wrappers for FileIOSharedMod, NCIOMod, MAPL_LocStreamMod (closes #4874) (#4883) * Remove base/ thin wrappers for FileIOSharedMod, NCIOMod, MAPL_LocStreamMod; move c_mapl_locstream_F.c to base3g/ (closes #4874) * Drop NCIOMod and MAPL_LocStreamMod from MAPL2 — symbols no longer needed there (refs #4874) * Add mapl2-migration skill documenting iterative PR process for base/ to base3g/ migrations * Update mapl2-migration skill: always rebase onto target branch before pushing/opening a PR * Remove orphaned write_parallel.H and read_parallel.H from base/ (now live in base3g/include/) (refs #4874) * Remove orphaned GetPointer.H from base/ — no longer used (refs #4874) * Remove orphaned GetFieldArray.H from base/ — no longer used (refs #4874) * Add TimeAccumulate with unit tests. * Remove period calculation; fix update procedures * Add TimeAccumulate with unit tests. * Fix two bugs with gfortran in pfunit tests. * Delete stale conflict markers. --------- Co-authored-by: Tom Clune <thomas.l.clune@nasa.gov>
mathomp4
added a commit
that referenced
this pull request
May 15, 2026
Co-authored-by: Atanas Trayanov <Atanas.L.Trayanov@nasa.gov> Co-authored-by: Tom Clune <thomas.l.clune@nasa.gov> Co-authored-by: Atanas Trayanov <atanas.trayanov@gmail.com> Co-authored-by: Matt Thompson <matthew.thompson@nasa.gov> Co-authored-by: pchakraborty <pchakraborty@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: tclune <6225888+tclune@users.noreply.github.com> Co-authored-by: Weiyuan Jiang <52509753+weiyuan-jiang@users.noreply.github.com> Co-authored-by: Darian Boggs <61847056+darianboggs@users.noreply.github.com> Co-authored-by: Weiyuan Jiang <wjiang@gs6101-bucy.gsfc.nasa.gov> Co-authored-by: Matthew Thompson <matthew.thompson@nasa.gov> Co-authored-by: Benjamin Auer <benjamin.m.auer@nasa.gov> Co-authored-by: Purnendu Chakraborty <purnendu.chakraborty@nasa.gov> Co-authored-by: Darian Boggs <william.d.boggs@nasa.gov> Co-authored-by: Atanas L. Trayanov <atrayano@gs6101-bucy.gsfc.nasa.gov> Fixes #4455 Fixes #4482 Fixes #4481 Closes #4497 (Task 2.8) Fixes #4497 Fixes #4506 Fixes #4522 Fixes #4527 Resolves #4528 Resolves #4529 fixes the build failure in PR #4538. Fix generic3g layer normalization to use vertical stagger and condensed arrays (#4543) (#4544) Resolves #4531 Resolves #4531 Task 7 fixes #4566 Fixes #4573 fix CI-breaking _ASSERT (#4440) Fix gfortran preprocessor error: no multi-line _ASSERT args (#4440) fix _FAILURE macro (#4586) Closes #4600 Fix ifx #6451: rename use_field_dictionary dummy arg to use_fd Fix ifx #6451: rename use_field_dictionary dummy arg to use_fd" Resolve handmerge conflicts for #4610 into release/MAPL-v3 Fixes #4625 Fix precision changes in constants per Gemini (#4635) Fix modules that inadvertently re-export StringVector (#4639) fixes #4598 (#4632) fixes #4598 Fixes #4563 fix(FieldBLAS): propagate MAPL_UNDEF through field arithmetic (#4651) fix(test): avoid grid-resonance in masked vector regrid test (#4653) Fixes #4652. fix(DynamicMask): remove cross-precision mask value casts (#4663) Fixes #4654 fix(regridder): reference issue #4672 in dateline: DC workaround comment fixes #4661) Closes #4678 Fix RegridTransform typekind for cross-geom connections (#4694) (#4702) Fix RegridTransform typekind for cross-geom connections (#4694) Closes #4706 Closes #4708 Fix NAG OpenMP per-DSO lazy initialization crash in profiler (#4715) Closes #4700 Fixes for Spack, NAG, and Python 3.11 (#4671) Fix vertical regrid (#4675) fixes #4721 (#4722) Closes #4725 Closes #4724 Closes #4730 (partially — OpenMP part only; MAPL_GenericMod remains) Fixes #4743 (#4744) fix on locally-defined names in Comms.F90; MAPL_root -> MAPL_ROOT (#4747) Fix public MAPL_ROOT export and replace rc=status/_VERIFY with _RC in include/*.H (#4747) Fix CI failures: uppercase MPI names in only: list, replace nint with int in save initializer (#4747) Closes #4752. Closes #4762 (partial - MAPL_Resource deferred). Closes #4755. Fixes for MAPL3 docs (#4768) fix for capitalization issue. (#4774) fix Aerosol_Cap.F90 MAPL_Finalize call (#4780) Closes #4776. Fixes #4792 (#4793) Resolves #4788 Fix blatant bug in ExtData3G (#4804) Fixes #4805. Closes #4811. Closes #4811 Closes #4825 Closes #4809. Part of #4828. Closes #4844. Last call site was removed in GEOS-ESM/GEOSgcm_GridComp#1405. Closes #4846. Closes #4849 fixes #4875) closes #4874) (#4883) closes #4874) fix stale tests (refs #4884) (#4885) fix valid_range/source_time parsing in ExtData3G (refs #4884) Fix Test_HConfigAs: split semicolon-separated @assertEqual onto separate lines (refs #4884) fix for crash in case of absent optional dummy (#4887) Closes #4554
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
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
base/FileIOShared.F90,base/NCIO.F90,base/MAPL_LocStreamMod.F90introduced in Move FileIOSharedMod, NCIOMod, MAPL_LocStreamMod to base3g/; re-export through MAPL umbrella #4882c_mapl_locstream_F.cfrombase/tobase3g/whereMAPL_LocStreamModnow livesuse NCIOModanduse MAPL_LocStreamModfromMAPL2— no active clients rely onMAPL2for these symbolsDependency
Depends on #4882 (merged) and client migrations in FVdycoreCubed_GridComp#379, GMAO_Shared#434, GFDL_atmos_cubed_sphere#123 (all merged).