Skip to content

Handmerge #372 into main#377

Merged
sdrabenh merged 23 commits into
mainfrom
merge/handmerge/main-into-372
Apr 23, 2025
Merged

Handmerge #372 into main#377
sdrabenh merged 23 commits into
mainfrom
merge/handmerge/main-into-372

Conversation

@mathomp4
Copy link
Copy Markdown
Member

@mathomp4 mathomp4 commented Apr 15, 2025

This PR is a handmerge of #372 from @rtodling into main. #372 needed this due to conflicts.

This should come with GEOS-ESM/GMAO_perllib#1 which will be GMAO_perllib v1.1.0

rtodling and others added 20 commits March 18, 2024 15:35
* update g5_modules_perl_wrapper script to remove loadmodules option from call to g5_modules

* Modified the expand function in Perl_Config.pm so that environment variables will be correctly expanded in the string if the variables are defined.

---------

Co-authored-by: rtodling <ricardo.todling@nasa.gov>
# Conflicts:
#	.gitignore
#	CHANGELOG.md
#	GMAO_etc/vED
#	GMAO_perllib/CMakeLists.txt
#	GMAO_pyobs/VegType_io.c
@mathomp4 mathomp4 requested review from a team as code owners April 15, 2025 18:00
@mathomp4 mathomp4 requested a review from rtodling April 15, 2025 18:00
@mathomp4
Copy link
Copy Markdown
Member Author

This is failing because of some straggling GMAO_perllib files. See GEOS-ESM/GMAO_perllib#1 for these.

@mathomp4 mathomp4 self-assigned this Apr 15, 2025
@mathomp4 mathomp4 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Apr 15, 2025
sdrabenh
sdrabenh previously approved these changes Apr 16, 2025
@mathomp4
Copy link
Copy Markdown
Member Author

GMAO_perllib v1.1.0 is now released.

When this is put into GMAO_Shared, we should make a joint PR in GEOSgcm.

@sdrabenh sdrabenh merged commit 6d1de27 into main Apr 23, 2025
6 checks passed
@sdrabenh sdrabenh deleted the merge/handmerge/main-into-372 branch April 23, 2025 14:38
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.

4 participants