Skip to content

Add three new CVMix parameters #392

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.

Sign up for GitHub

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

Merged
alperaltuntas merged 3 commits into from
Oct 22, 2025
Merged

Add three new CVMix parameters #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c5cd88
Add three new CVMix parameters
mnlevy1981 Oct 3, 2025
19c2210
Update CVMix external in pkg/
mnlevy1981 Oct 20, 2025
de909f4
Description comments weren't in right format
mnlevy1981 Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/CVMix-src
Open in desktop
Submodule CVMix-src updated 19 files
+8 −0 .github/workflows/run_test_suite.yml
+354 −0 CVMix_tools/netcdf_comparison.py
+63 −2 CVMix_tools/run_test_suite.sh
+ − baselines/Bryan-Lewis/data_memcopy.nc
+ − baselines/Bryan-Lewis/data_pointer.nc
+ − baselines/double_diff/data.nc
+ − baselines/kpp/test1.nc
+ − baselines/kpp/test3.nc
+ − baselines/kpp/test4a.nc
+ − baselines/kpp/test4b.nc
+ − baselines/kpp/test4c.nc
+ − baselines/kpp/test4d.nc
+ − baselines/kpp/test5.nc
+ − baselines/kpp/test7.nc
+ − baselines/shear/data_LMD.nc
+ − baselines/shear/data_PP1d.nc
+ − baselines/shear/data_PP2d.nc
+ − baselines/tidal-Simmons/single_col.nc
+41 −6 src/shared/cvmix_kpp.F90
16 changes: 16 additions & 0 deletions src/parameterizations/vertical/MOM_CVMix_KPP.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ module MOM_CVMix_KPP
real :: MLD_guess_min !< The minimum estimate of the mixed layer depth used to
!! calculate the Langmuir number for Langmuir turbulence
!! enhancement with KPP [Z ~> m]
real :: KPP_ER_Cb !< Entrainment Rule TKE buoyancy production weight [nondim]
real :: KPP_ER_Cs !< Entrainment Rule TKE Stokes production weight [nondim]
real :: KPP_ER_Cu !< Entrainment Rule TKE shear production weight [nondim]
logical :: STOKES_MIXING !< Flag if model is mixing down Stokes gradient
!! This is relevant for which current to use in RiB
integer :: answer_date !< The vintage of the order of arithmetic in the CVMix KPP
Expand Down Expand Up @@ -532,6 +535,16 @@ logical function KPP_init(paramFile, G, GV, US, diag, Time, CS, passive)
'Parameter for Stokes MOST convection entrainment (unresolved shear)', &
units="nondim", default=1.6)

call get_param(paramFile, mdl, "KPP_ER_Cb", CS%KPP_ER_Cb, &
'Entrainment Rule TKE buoyancy production weight', &
units="nondim", default=0.96)
call get_param(paramFile, mdl, "KPP_ER_Cs", CS%KPP_ER_Cs, &
'Entrainment Rule TKE Stokes production weight', &
units="nondim", default=0.038)
call get_param(paramFile, mdl, "KPP_ER_Cu", CS%KPP_ER_Cu, &
'Entrainment Rule TKE shear production weight', &
units="nondim", default=0.023)

call get_param(paramFile, mdl, "ANSWER_DATE", CS%answer_date, &
"The vintage of the order of arithmetic in the CVMix KPP calculations. Values "//&
"below 20240501 recover the answers from early in 2024, while higher values "//&
Expand All @@ -548,6 +561,9 @@ logical function KPP_init(paramFile, G, GV, US, diag, Time, CS, passive)
vonKarman=CS%vonKarman, &
surf_layer_ext=CS%surf_layer_ext, &
CVt2=CS%KPP_CVt2, &
ER_Cb=CS%KPP_ER_Cb, &
ER_Cs=CS%KPP_ER_Cs, &
ER_Cu=CS%KPP_ER_Cu, &
interp_type=CS%interpType, &
interp_type2=CS%interpType2, &
lEkman=CS%computeEkman, &
Expand Down