Two small fixes for FPMix #321
Merged
Conversation
This file contains 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
1. Update CVMix to fix a bug (was not computing L_StokesL correctly when updating w_s) 2. Special case for k=1 when computing surfBuoyFlux in Stokes MOST Also added CVMix KPP parameter CVt2 to paramFile so it can be adjusted at run-time
gustavo-marques
approved these changes
Oct 31, 2024
mnlevy1981
commented
Oct 31, 2024
Comment on lines
440
to
442
| call get_param(paramFile, mdl, "KPP_CVt2", CS%KPP_CVt2, & | ||
| 'Parameter for Stokes MOST convection entrainment', & | ||
| units="nondim", default=1.6) |
There was a problem hiding this comment.
This is in an if (CS%LT_K_Enhancement) then and it shouldn't be; I'm a little surprised this is passing the test suite because I don't think CS%KPP_CVt2 is initialized before being passed to cvmix_init_kpp(). I didn't run a gnu debug test, which might catch it?
I'm testing a fix (moving these lines out of the if block), then I'll mark this ready to review again.
Make sure that KPP_CVt2 is read whenever KPP is enabled (may eventually want to only provide it if using Stokes MOST?)
|
@alperaltuntas I've verified that the last commit lets us change So this is ready to go now |
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.
L_StokesLcorrectly when updatingw_s)k=1when computingsurfBuoyFluxin Stokes MOSTAlso added CVMix KPP parameter
CVt2toparamFileso it can be adjusted at run-timeI ran
pr_mom(without baseline comparison because this is answer-changing). All 5 tests finished successfully, though I did see the expected failures:(I tested before #318 was merged)