Repository navigation
Minor refactoring of KPP - #621
Merged
Merged
Conversation
Member
Author
Testing: CTestsAll tests passed on:
One test ( Testing:
|
There was a problem hiding this comment.
🟢 Approval recommended
Only a minor documentation nit remains, with no blocking issues.
1 open issue
What changed in this PR
This PR refactors KPP-aware convective mixing and standardizes floating-point literals.
Changes:
- Adds
_Realsuffixes to KPP constants. - Makes convective mixing KPP-aware.
- Removes unnecessary disabled-KPP index allocation.
- Updates the related test.
| File | Summary |
|---|---|
components/omega/test/ocn/VertMixTest.cpp |
Updates convective-mixing test arguments. |
components/omega/src/ocn/VertMix.h |
Adds KPP-aware mixing logic; includes a minor grammatical nit. |
components/omega/src/ocn/VertMix.cpp |
Integrates the refactored convective mixer. |
components/omega/src/ocn/KPPConstants.h |
Standardizes floating-point literal types. |
Review effort: Lite
Member
Author
|
@vanroekel Would you mind having a look ? |
Collaborator
|
Sure, I can review |
vanroekel
approved these changes
Oct 21, 2026
vanroekel
left a comment
vanroekel
left a comment
Collaborator
There was a problem hiding this comment.
approving by visual inspection. I also ran the kpp suite and looked through the results and they appear consistent with develop
Collaborator
Testing on chrysalisTested the merge of #621 (
chrysalis, intel, openmpiPolaris
|
Collaborator
Testing on frontierTested the merge of #621 (
frontier, craygnu, mpichPolaris
|
Collaborator
Testing on pm-cpu and pm-gpuTested the merge of #621 (
pm-cpu, gnu, mpichPolaris
|
Collaborator
Testing on auroraTested the merge of #621 (
aurora, intel, mpichPolaris
|
Collaborator
|
The fix for the reproducibility issue noted in the realistic global cases is in #646 |
Collaborator
Testing on
|
Collaborator
Testing on
|
andrewdnolan
approved these changes
Oct 27, 2026
4 of 8 tasks
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
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.
This PR does two things:
_Realsuffix to all floating-point literals inKPPConstants.hthat were missing it.VertMix.hdefined theConvectiveMixclass andVertMixhad an instance of it, but this member variable was not used. Instead, convective mixing was implemented inline incomputeVertMix. This PR refactors the code so thatConvectiveMixis KPP-aware and can be used as intended. In the process of refactoring this code I also removed the need to allocateKPPBoundaryLayerIndexfilled with-1when KPP is disabled.Checklist
Linting
Building
Testing
aurora, intel, mpich
aurora, intelgpu, mpich
chrysalis, intel, openmpi
PEM_D.T62_oQU240.GOMEGA-IAFERS_Ld3.ne4pg2_oQU240.WCYCL1850NS-OMEGAfrontier, craygnu, mpich
frontier, craygnu-mphipcc, mpich
ERS_Ld5.T62_oQU240.GOMEGA-IAFERS_Ld3.ne4pg2_oQU240.WCYCL1850NS-OMEGApm-cpu, gnu, mpich
pm-gpu, gnugpu, mpich
Provide relevant details in a comment to the PR titled
Testingwith the following:have been run on and indicate that are all passing.
has passed, using the Polaris
e3sm_submodules/Omegabaseline-pfor both the baseline (Polarise3sm_submodules/Omega) and the PR build