Skip to content

Conversation

@weiyuan-jiang
Copy link
Contributor

@weiyuan-jiang weiyuan-jiang commented Jun 2, 2025

Move the file EASE_Conv.F90 to MAPL.

Contingent on: GEOS-ESM/MAPL#3698. Requires updated MAPL version in GEOSgcm and any other fixtures that use the develop branch of GEOSgcm_GridComp.

Successfully 0-diff tested by @biljanaorescanin for GEOSgcm, GEOSldas, and make_bcs, see #1112 (comment) and GEOS-ESM/GEOSldas#819 (comment).

@weiyuan-jiang weiyuan-jiang requested review from a team as code owners June 2, 2025 18:24
@weiyuan-jiang weiyuan-jiang added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Jun 2, 2025
@weiyuan-jiang weiyuan-jiang mentioned this pull request Jun 2, 2025
9 tasks
@gmao-rreichle gmao-rreichle added the Contingent - DNA These changes are contingent on other PRs (DNA=do not approve) label Jun 3, 2025
@biljanaorescanin
Copy link
Contributor

I've made a small push to branch since I noticed a typo in print comment:
if we run: ./make_bcs.py
we would get: GEOSldas/install/bin/make_bcs_questionary.py:78: SyntaxWarning: invalid escape sequence '\!'
print(" \!\!\!\! Invalid Ocean Resolution, stopping ")
command_line_args: Namespace(config_file=None)
? Skip land parameter files ?:
Last commit fixes that trivial typo.
No, I didn't notice this before... now I had glasses :)

@biljanaorescanin
Copy link
Contributor

@sdrabenh PR was tested for 1 day AMIP, REPLAY and IncREPLAY and all were zero diff.

Repo Original Current
MAPL (t) v2.56.0 (DH) (b) feature/wjiang/ease_grid
GEOSgcm_GridComp (t) v2.7.4 (DH) (b) feature/wjiang/ease_grid

gmao-rreichle
gmao-rreichle previously approved these changes Jun 17, 2025
mathomp4
mathomp4 previously approved these changes Jun 18, 2025
sdrabenh
sdrabenh previously approved these changes Jun 18, 2025
@mathomp4 mathomp4 dismissed stale reviews from sdrabenh, gmao-rreichle, and themself via f43a350 June 18, 2025 13:33
mathomp4 added a commit to GEOS-ESM/GEOSgcm that referenced this pull request Jun 18, 2025
This PR updates GEOSgcm to MAPL 2.57. This is needed for the (future)
GEOSgcm_GridComp v2.7.5 which will incorporate GEOS-ESM/GEOSgcm_GridComp#1112

MAPL 2.57 has EASE Grid routines that were in GEOSgcm_GridComp. They
were moved to MAPL and then all public routines were prefixed by
`MAPL_`.

This should allow for MAPL 2.57 to work with older GEOSgcm_GridComp tags
that do not have the `MAPL_` prefix (e.g., GEOSadas). But, we want GEOSgcm_GridComp to
use the routines in MAPL.
@mathomp4 mathomp4 removed the Contingent - DNA These changes are contingent on other PRs (DNA=do not approve) label Jun 18, 2025
@mathomp4
Copy link
Member

I am merging this now so that we can get it into develop.

@mathomp4 mathomp4 merged commit f48f259 into develop Jun 18, 2025
11 of 12 checks passed
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants