Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge BRIDGE into main in prep for release v17.12.0 #614

Merged
merged 162 commits into from
Dec 16, 2022
Merged

Conversation

gmao-rreichle
Copy link
Contributor

@gmao-rreichle gmao-rreichle commented Dec 16, 2022

Merging latest "develop" branch into "main" (via a "BRIDGE" branch). All changes have been vetted already when they were merged into "develop".

weiyuan-jiang and others added 30 commits May 6, 2022 16:10
…nts-ldas

Update ESMA_cmake, ESMA_env, MAPL
…ig_files/

	modified:   src/Applications/LDAS_App/CMakeLists.txt
	modified:   src/Applications/LDAS_App/ens_forcing/enpert_forc.csh
	modified:   src/Applications/LDAS_App/ens_forcing/test_enpert_forc.j
	modified:   src/Applications/LDAS_App/sample_config_files/LADAS/HISTORY.rc.atmens
	modified:   src/Applications/LDAS_App/sample_config_files/LADAS/HISTORY.rc.central
	new file:   src/Applications/LDAS_App/sample_config_files/LADAS/expinp.txt.Hy4dEnVar.atmens
	new file:   src/Applications/LDAS_App/sample_config_files/LADAS/expinp.txt.Hy4dEnVar.central
…Rs being merged in GMAO_Shared and GEOSgcm_GridComp
mathomp4 and others added 23 commits December 1, 2022 15:25
Due to changes at Heroku, we need to transition to use a GitHub Action for label enforcement. The current label enforcer no longer works, so PRs will be "stuck" until this is fixed.
Use cleaned-up make_bcs utilities (EASE grid tools) from GEOS-ESM/GEOSgcm_GridComp#634
MAPL v2.33.0
Baselibs 7.7.0
ESMA_env v4.8.0 
ESMA_cmake v3.21.0
ecbuild v1.3.0
@gmao-rreichle gmao-rreichle self-assigned this Dec 16, 2022
@gmao-rreichle gmao-rreichle requested review from a team as code owners December 16, 2022 21:35
@github-actions
Copy link

Label error. Requires at least 1 of: 0 diff, 0 diff trivial, Non 0-diff, 0 diff structural, 0-diff trivial, Not 0-diff, 0-diff, automatic, 0-diff uncoupled. Found:

@gmao-rreichle gmao-rreichle merged commit eef59e2 into main Dec 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants