Skip to content

Remove legacy MAPL2 regridder-dependent code#356

Merged
tclune merged 3 commits intorelease/MAPL-v3from
feature/4661-remove-legacy-regridder-modules
Apr 24, 2026
Merged

Remove legacy MAPL2 regridder-dependent code#356
tclune merged 3 commits intorelease/MAPL-v3from
feature/4661-remove-legacy-regridder-modules

Conversation

@tclune
Copy link
Copy Markdown
Collaborator

@tclune tclune commented Apr 21, 2026

Summary

Removes all code in FVdycoreCubed_GridComp that depended on the legacy MAPL2 regridder stack, which is being removed in the companion MAPL PR (GEOS-ESM/MAPL#4662).

Deleted files

Regridder implementations:

  • `CubeToCubeRegridder.F90`
  • `CubeToLatLonRegridder.F90`
  • `LatLonToCubeRegridder.F90`

Regridder registration:

  • `CubeGridPrototype.F90` (registered old-style prototypes into `regridder_manager`)

Restart interpolation executables and support:

  • `fv_regrid_c2c.F90` (used `AbstractRegridder` / `new_regridder_manager`)
  • `fv_regrid_c2c_bin.F90`
  • `interp_restarts.F90`
  • `interp_restarts_bin.F90`
  • `c2c.F90`

Other changes

  • Remove `use`/`call` sites for `register_grid_and_regridders` from `AdvCore_GridCompMod.F90` and `DynCore_GridCompMod.F90`
  • Remove all deleted sources and executable targets from `CMakeLists.txt`

Notes

This PR should be merged before GEOS-ESM/MAPL#4662 (the MAPL PR is draft until this lands).

Remove all code that depended on the removed MAPL2 regridder stack:
- CubeToCubeRegridder, CubeToLatLonRegridder, LatLonToCubeRegridder
- CubeGridPrototype (registered old-style prototypes into regridder_manager)
- fv_regrid_c2c, fv_regrid_c2c_bin (used AbstractRegridder/new_regridder_manager)
- interp_restarts, interp_restarts_bin (depended on fv_regrid_c2c*)
- c2c (used AbstractRegridder/regridder_manager)

Remove corresponding use/call sites in AdvCore_GridCompMod and DynCore_GridCompMod.
Update CMakeLists.txt to remove all deleted sources and executable targets.
@tclune tclune requested review from a team as code owners April 21, 2026 18:33
@tclune tclune added the MAPL3 MAPL 3 Related label Apr 21, 2026
Comment thread DynCore_GridCompMod.F90 Outdated
@tclune tclune added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Apr 21, 2026
pchakraborty
pchakraborty previously approved these changes Apr 22, 2026
Copy link
Copy Markdown
Collaborator

@pchakraborty pchakraborty left a comment

Choose a reason for hiding this comment

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

Looks good to me. The MAPL3 port of DynCore wasn’t doing any regridding.

…(refs #4661)

- Replace 'use MAPL2' with explicit MAPL3 module uses
- Drop ESMF_Grid args from get_geos_ic/get_geos_cubed_ic; replace with ESMF_Geom
- Replace AbstractRegridder with mapl3g Regridder (array overloads from #4669)
- Replace new_regridder_manager%make_regridder with get_regridder_manager()%get_regridder(RegridderSpec(...))
- Replace CubedSphereGridFactory/grid_manager with CubedSphereGeomSpec/GeomManager in interp_restarts
- Add fv_regrid_c2c.F90 and interp_restarts.x back to CMakeLists.txt
Copy link
Copy Markdown
Collaborator

@pchakraborty pchakraborty left a comment

Choose a reason for hiding this comment

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

LGTM

@tclune tclune merged commit 982790f into release/MAPL-v3 Apr 24, 2026
8 checks passed
tclune added a commit that referenced this pull request May 2, 2026
This file was missed when PR #356 removed the legacy MAPL2
regridder-dependent code. It should have been deleted then.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0 diff The changes in this pull request have verified to be zero-diff with the target branch. MAPL3 MAPL 3 Related

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants