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/narnold1/#560 shocmf updates #783

Merged
merged 29 commits into from
Aug 24, 2023

Conversation

narnold1
Copy link
Contributor

Extensive updates to the SHOC-EDMF turbulence parameterizations.

This PR is non-0-diff due to fixing a bug in the calculation of (non-SHOC) TKE in GEOS_TurbulenceGridComp.F90. If bugfix is excluded, output fields are 0-diff.

This update also renames several SHOC variables (switching 'HL' to 'SL' for consistency with other model variables), which technically changes restart files. The affected variables are not used in default model configurations.

@narnold1 narnold1 added bugfix This fixes a bug Draft labels Jul 17, 2023
@narnold1 narnold1 requested review from a team as code owners July 17, 2023 14:16
@narnold1 narnold1 added the Non 0-diff The changes in this pull request are non-zero-diff label Jul 17, 2023
tclune
tclune previously approved these changes Jul 17, 2023
Copy link
Collaborator

@tclune tclune left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CMake changes ok

Co-authored-by: Tom Clune <thomas.l.clune@nasa.gov>
@narnold1 narnold1 marked this pull request as draft July 18, 2023 20:25
narnold1 added 5 commits July 19, 2023 10:51
…S-ESM/GEOSgcm_GridComp into feature/narnold1/#560-shocmf-updates
…ed MF threshold for PRNUM, replaced Lmix with zpbl in L2, removed kludge on L3 and set min tkes at 0.1, moved PDF_A calc to update_moments, limit MF to below 2km topography, added EDMF_DEPTH diag
@narnold1 narnold1 added 0 diff The changes in this pull request have verified to be zero-diff with the target branch. and removed Non 0-diff The changes in this pull request are non-zero-diff bugfix This fixes a bug Draft labels Jul 31, 2023
@narnold1
Copy link
Contributor Author

narnold1 commented Aug 1, 2023

Updated the branch to remove the bugfix. Now 0-diff for all restarts except turb_internal_rst, turb_import_rst, and moist_import_rst, which are superficially affected by the HL to SL variable name changes.

@narnold1 narnold1 marked this pull request as ready for review August 1, 2023 14:28
@narnold1 narnold1 linked an issue Aug 1, 2023 that may be closed by this pull request
@sdrabenh sdrabenh added the Non 0-diff The changes in this pull request are non-zero-diff label Aug 22, 2023
@sdrabenh sdrabenh merged commit 750b06f into develop Aug 24, 2023
@sdrabenh sdrabenh deleted the feature/narnold1/#560-shocmf-updates branch August 24, 2023 23:17
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. Non 0-diff The changes in this pull request are non-zero-diff
Projects
None yet
Development

Successfully merging this pull request may close these issues.

edmf random seed not too random?
4 participants