hand merge feature/sdrabenh/gcm_v12 into develop#388
Open
hand merge feature/sdrabenh/gcm_v12 into develop#388
Conversation
…current x run testing
…rxruns Addresses the incorrect seasonal cycle in the CEDS emissions for the …
…into feature/sdrabenh/gcm_v12
…vation fixes, MP tuning to produce more QS from QI, Convection tuning for high-res, GFDL-MP cleanup, Beljaars tuning
…h_alarm # Conflicts: # ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridCompMod.F90 # ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridCompMod.F90
v12: Move to new createReplenishAlarm
mathomp4
reviewed
Feb 24, 2026
| ## [v2.6.0] - 2026-02-05 | ||
|
|
||
| ### Changed | ||
| -Filepath for CEDS has been updated in the ExtData yaml and rc files. Note the old version had an incorrect seasonal cycle. |
Member
There was a problem hiding this comment.
Suggested change
| -Filepath for CEDS has been updated in the ExtData yaml and rc files. Note the old version had an incorrect seasonal cycle. |
This line can be deleted. It's already in the CHANGELOG below it.
Member
I think it's so unneeded, it's breaking the CI builds: |
Contributor
Not too long ago I pulled fwet = 1 out of all the fortran code and put in inside the instance.rc file for each species. |
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
5 participants
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.
Hi @vbuchard I went through and hand-merged our latest v12 branch into develop in this pull request. There were 14 files with direct conflicts, thus Github was unable to display these differences correctly. Most of the conflicts were minor, but there are two changes that I would ask you to look at:
DU2G_GridCompMod.F90has the additionalfwet = 1.0prior to the function call. It looks like this line is no longer needed based on other changes, but you would know best.SS2G_instance_SS.rchas differentemission_scalenumbers. These are the numbers currently used in v12. If you believe develop's are more suitable for L181, we can try those. Please let us know.Feel free to edit this branch directly (even online through Github) as you see appropriate. Once this PR is merged into develop, Github should display things correctly once again. When we have a tag with these resolutions, we should be able to run science tests.