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

Feature/pnorris/rrtmgp validation handmerge #33

Merged
merged 35 commits into from
Feb 22, 2024

Conversation

mathomp4
Copy link
Member

No description provided.

dr0cloud and others added 3 commits February 15, 2024 11:46
# Conflicts:
#	GEOSsolar_GridComp/GEOS_SolarGridComp.F90
#	GEOSsolar_GridComp/RRTMG/rrtmg_sw/gcm_model/src/rrtmg_sw_rad.F90
@mathomp4 mathomp4 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Feb 21, 2024
@mathomp4 mathomp4 self-assigned this Feb 21, 2024
dr0cloud
dr0cloud previously approved these changes Feb 21, 2024
@dr0cloud
Copy link
Collaborator

Thanks to @mathomp4 for hand merging these changes. Note that they are non-zero-diff for RRTMGP but that is not run by default currently. For RRTMG they are either zero-diff or 'truncation zero-diff', but these changes should only affect diagnostic outputs and I don't think will affect the model state.

One more thing. I have changed the export 'TAUTTX' to 'TAUTX'. I should check tomorrow whether this is currently included in the default HISTORY's and fix if necessary. I will do a separate PR for the @GEOS_App tomorrow. P.

@mathomp4
Copy link
Member Author

@dr0cloud Okay. Looks like I screwed something up with the merge as the build is failing. I'm guessing an #ifdef got indented. Let me fix it up...

@mathomp4 mathomp4 marked this pull request as ready for review February 22, 2024 14:37
@mathomp4 mathomp4 requested review from a team as code owners February 22, 2024 14:37
@mathomp4 mathomp4 merged commit 88fa465 into develop Feb 22, 2024
9 checks passed
@mathomp4 mathomp4 deleted the feature/pnorris/RRTMGP_validation-handmerge branch May 17, 2024 17:02
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.

2 participants