diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 4cd38afac3..439613d7a4 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -1077,6 +1077,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = True ! [Boolean] default = True ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short index 6f2e0bff48..dd42d33414 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short @@ -295,6 +295,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index 2777bf1ee0..d35e798946 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -1077,6 +1077,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short index d3f5b0ab18..b6029c6bf6 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short @@ -279,6 +279,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all index 7643815b19..38b9d2f57b 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all @@ -1077,6 +1077,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.short index 61e2efa3b3..2add5bf549 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.short @@ -282,6 +282,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 6b5a751c26..6031dd1956 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1077,6 +1077,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short index 5a7a87aadf..ff7b40fd7e 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short @@ -290,6 +290,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all index 1fdf5e6cb1..22b2ae3a24 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all @@ -1287,6 +1287,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short index 0d43419618..179aa53b2a 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short @@ -332,6 +332,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! If true, use mass weighting when interpolating T/S for integrals near the ! bathymetry in FV pressure gradient calculations. +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all index 8233a40b94..b04fe5cd0e 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -1302,6 +1302,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = True ! [Boolean] default = True ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short index c81e5b4261..789de89d85 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short @@ -421,6 +421,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! If true, use mass weighting when interpolating T/S for integrals near the ! bathymetry in FV pressure gradient calculations. +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all index ce690f59a8..e55df18e8e 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -1315,6 +1315,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = True ! [Boolean] default = True ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short index 5611a40afe..a9b793c259 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short @@ -439,6 +439,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! If true, use mass weighting when interpolating T/S for integrals near the ! bathymetry in FV pressure gradient calculations. +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 617a715d93..5f444512e2 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1302,6 +1302,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = True ! [Boolean] default = True ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index 90d9ad422d..da310c0fc8 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -428,6 +428,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! If true, use mass weighting when interpolating T/S for integrals near the ! bathymetry in FV pressure gradient calculations. +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 5061653ee4..e70eb9827e 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1315,6 +1315,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = True ! [Boolean] default = True ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index 70926f8a7f..7375570fce 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -443,6 +443,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! If true, use mass weighting when interpolating T/S for integrals near the ! bathymetry in FV pressure gradient calculations. +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index 2c1ba40b73..fee9f9c9d7 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -1293,6 +1293,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = True ! [Boolean] default = True ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short index 8b60ad0ba8..d8fbe9010d 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short @@ -455,6 +455,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! If true, use mass weighting when interpolating T/S for integrals near the ! bathymetry in FV pressure gradient calculations. +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 26fe7c78b0..78ca351c93 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1044,6 +1044,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short index 9dda5f4c07..13d4cd2b76 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short @@ -317,6 +317,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 666a5845a6..e2777123af 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1044,6 +1044,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short index fad79f17c6..ab5534691b 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short @@ -317,6 +317,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 658ac68d28..f66a12bd70 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1044,6 +1044,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short index e39f983f6c..df146adb9c 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short @@ -317,6 +317,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all index e2c0664bbe..65cdf1d26a 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all @@ -881,6 +881,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short index d63f44c861..05e1fc3e3c 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short @@ -225,6 +225,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all index d1aa64765f..aae0ecfb2c 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all @@ -988,6 +988,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short index 7fb2046ddb..89a1656232 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short @@ -254,6 +254,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all index ec741b478c..bde3dd5637 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all @@ -988,6 +988,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short index 2708a92f2b..db7f28a394 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short @@ -254,6 +254,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all index cfe9f3eaa4..155be847ea 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all @@ -881,6 +881,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short index 4253649f2c..fa01d4b7e3 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short @@ -225,6 +225,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all index baa77dc34e..06e9e5516d 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all @@ -988,6 +988,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short index 265fbf7dd2..0dd86406dc 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short @@ -254,6 +254,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all index eb60ae9eb5..fe65e8f0eb 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all @@ -988,6 +988,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short index bed686813f..dcf2fd1572 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short @@ -254,6 +254,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all index 9cf4089dbd..e52133da8e 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all @@ -881,6 +881,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short index 1d10f8cac6..ad6bd1e85a 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short @@ -223,6 +223,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all index 377217f1ea..0e9da93098 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all @@ -988,6 +988,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short index ac559b944f..64fde65b45 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short @@ -252,6 +252,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all index 4dceda90c1..ff310cfc3c 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all @@ -988,6 +988,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short index 46f84353ed..a4eed2b10c 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short @@ -252,6 +252,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all index 72b15cfb2e..5c8c869598 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all @@ -881,6 +881,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short index 3bc0dfd231..d265678617 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short @@ -225,6 +225,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all index 2f18173603..b5d1641306 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all @@ -988,6 +988,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short index 1d150411df..bfb83be6ab 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short @@ -254,6 +254,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all index 93a2747875..738f2ac1c0 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all @@ -988,6 +988,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short index a60aa16ba7..f007f58f89 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short @@ -254,6 +254,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 1eb563848a..7c92355666 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -899,6 +899,11 @@ ANALYTIC_FV_PGF = False ! [Boolean] default = True ! === module MOM_PressureForce_Mont === +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/DOME/MOM_parameter_doc.short b/ocean_only/DOME/MOM_parameter_doc.short index facb5a82c6..6fc5881d9d 100644 --- a/ocean_only/DOME/MOM_parameter_doc.short +++ b/ocean_only/DOME/MOM_parameter_doc.short @@ -270,6 +270,8 @@ ANALYTIC_FV_PGF = False ! [Boolean] default = True ! === module MOM_PressureForce_Mont === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === AH_VEL_SCALE = 0.003 ! [m s-1] default = 0.0 ! The velocity scale which is multiplied by the cube of the grid spacing to diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index 7c7c04f18c..278ec74b99 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -834,6 +834,11 @@ ANALYTIC_FV_PGF = False ! [Boolean] default = True ! === module MOM_PressureForce_Mont === +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.short b/ocean_only/Phillips_2layer/MOM_parameter_doc.short index c74986d472..bc9a923a8b 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.short +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.short @@ -268,6 +268,8 @@ ANALYTIC_FV_PGF = False ! [Boolean] default = True ! === module MOM_PressureForce_Mont === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === AH_VEL_SCALE = 0.003 ! [m s-1] default = 0.0 ! The velocity scale which is multiplied by the cube of the grid spacing to diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 8859409e4c..dfc18581fb 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -988,6 +988,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short index 5e1e8e9f01..90b5cd273d 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short @@ -227,6 +227,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 22d5e4c10f..036a305ea7 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -908,6 +908,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short index 5c6dc849a9..23e1f6c2dc 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short @@ -271,6 +271,8 @@ KE_SCHEME = "KE_GUDONOV" ! default = "KE_ARAKAWA" ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index dd491cb279..a5b79fdfd5 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -1062,6 +1062,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short index 886b883030..0f6aed109f 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short @@ -319,6 +319,8 @@ KE_SCHEME = "KE_GUDONOV" ! default = "KE_ARAKAWA" ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 541f2e97bd..84f19c7b8d 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -1014,6 +1014,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.short b/ocean_only/adjustment2d/z/MOM_parameter_doc.short index 5eb38dab1f..ab08c2d75a 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.short @@ -297,6 +297,8 @@ KE_SCHEME = "KE_GUDONOV" ! default = "KE_ARAKAWA" ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index e71a74b7a7..a783f88de4 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -991,6 +991,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/benchmark/MOM_parameter_doc.short b/ocean_only/benchmark/MOM_parameter_doc.short index cdf819ea89..bddb5f2f95 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.short +++ b/ocean_only/benchmark/MOM_parameter_doc.short @@ -299,6 +299,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === AH_VEL_SCALE = 0.05 ! [m s-1] default = 0.0 ! The velocity scale which is multiplied by the cube of the grid spacing to diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index e1207d5c10..05e07562b3 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -919,6 +919,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.short b/ocean_only/circle_obcs/MOM_parameter_doc.short index 706c3ca98e..85be53afb6 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.short +++ b/ocean_only/circle_obcs/MOM_parameter_doc.short @@ -241,6 +241,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 15aca93665..63462a24b1 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -789,6 +789,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/double_gyre/MOM_parameter_doc.short b/ocean_only/double_gyre/MOM_parameter_doc.short index c7a364895a..c58e53a48d 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.short +++ b/ocean_only/double_gyre/MOM_parameter_doc.short @@ -169,6 +169,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index b01450da06..2e4765b729 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -897,6 +897,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/external_gwave/MOM_parameter_doc.short b/ocean_only/external_gwave/MOM_parameter_doc.short index 349981cc9f..d46fe0b7b9 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.short +++ b/ocean_only/external_gwave/MOM_parameter_doc.short @@ -259,6 +259,8 @@ KE_SCHEME = "KE_GUDONOV" ! default = "KE_ARAKAWA" ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index fb0d8a5aa7..4c25497200 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -907,6 +907,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short index 318aa8a1d9..3b13d84566 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short @@ -272,6 +272,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index d8deae42fb..6daec28e24 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -1063,6 +1063,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short index 7947618fe9..989ae3f5a2 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short @@ -322,6 +322,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index b847287b72..d5f03873b6 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -1015,6 +1015,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short index a9208e563a..735fdd9990 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short @@ -298,6 +298,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index c6054ab067..b9e23241e2 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -1015,6 +1015,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.short b/ocean_only/flow_downslope/z/MOM_parameter_doc.short index bf3dd7021f..ea01e589c0 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.short @@ -298,6 +298,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index dee598e6e6..47c1a53818 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1337,6 +1337,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short index 20287b157a..7743e50b1e 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short @@ -350,6 +350,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! If true, use mass weighting when interpolating T/S for integrals near the ! bathymetry in FV pressure gradient calculations. +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index df80bddab5..f28fac5116 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1223,6 +1223,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.short b/ocean_only/global_ALE/layer/MOM_parameter_doc.short index 9988893a09..8338e73288 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.short @@ -276,6 +276,8 @@ TIDE_SAL_SCALAR_VALUE = 0.094 ! [m m-1] ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index d988128153..1885691036 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1284,6 +1284,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.short b/ocean_only/global_ALE/z/MOM_parameter_doc.short index 4527d58d7b..81bdb1ceef 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.short @@ -325,6 +325,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! If true, use mass weighting when interpolating T/S for integrals near the ! bathymetry in FV pressure gradient calculations. +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 14a9acb309..bf605b9f1a 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -900,6 +900,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.short b/ocean_only/lock_exchange/MOM_parameter_doc.short index f9ab099a9a..63cb35faf5 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.short +++ b/ocean_only/lock_exchange/MOM_parameter_doc.short @@ -253,6 +253,8 @@ KE_SCHEME = "KE_GUDONOV" ! default = "KE_ARAKAWA" ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all index 209527f90b..4e8922481d 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -1000,6 +1000,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short index fbf1e2d5ce..1b0016a3c0 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short @@ -293,6 +293,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 8926535bec..5b111a976e 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1064,6 +1064,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.short b/ocean_only/nonBous_global/MOM_parameter_doc.short index 4602d36768..f0eca5de66 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.short +++ b/ocean_only/nonBous_global/MOM_parameter_doc.short @@ -319,6 +319,8 @@ TIDE_SAL_SCALAR_VALUE = 0.094 ! [m m-1] ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index ea5c96410d..5e497e604a 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -892,6 +892,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/resting/layer/MOM_parameter_doc.short b/ocean_only/resting/layer/MOM_parameter_doc.short index 60c14efb74..49ccc3f926 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.short +++ b/ocean_only/resting/layer/MOM_parameter_doc.short @@ -238,6 +238,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 8d1d35eec9..dd747c6160 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -1000,6 +1000,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/resting/z/MOM_parameter_doc.short b/ocean_only/resting/z/MOM_parameter_doc.short index ca20bcd276..16de362101 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.short +++ b/ocean_only/resting/z/MOM_parameter_doc.short @@ -252,6 +252,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 1e7ced82de..8c7cec23c2 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -925,6 +925,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.short b/ocean_only/seamount/layer/MOM_parameter_doc.short index d60745a154..7bac0c8627 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.short +++ b/ocean_only/seamount/layer/MOM_parameter_doc.short @@ -271,6 +271,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 5b87383a58..4c36c59503 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -1079,6 +1079,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.short b/ocean_only/seamount/rho/MOM_parameter_doc.short index 0e6fc13bff..3a38870c75 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.short +++ b/ocean_only/seamount/rho/MOM_parameter_doc.short @@ -322,6 +322,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! If true, use mass weighting when interpolating T/S for integrals near the ! bathymetry in FV pressure gradient calculations. +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index bc8772ed3b..9a12ffe843 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -1028,6 +1028,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.short b/ocean_only/seamount/sigma/MOM_parameter_doc.short index f589febd83..f8d97fa36e 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.short +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.short @@ -297,6 +297,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 80079f7cd1..60cae7a5c5 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -1028,6 +1028,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/seamount/z/MOM_parameter_doc.short b/ocean_only/seamount/z/MOM_parameter_doc.short index b26fb876a1..06b9681509 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.short +++ b/ocean_only/seamount/z/MOM_parameter_doc.short @@ -297,6 +297,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index 3c1decdfbf..e029358935 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -911,6 +911,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.short b/ocean_only/single_column/BML/MOM_parameter_doc.short index 638988e00f..2abb357e44 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.short +++ b/ocean_only/single_column/BML/MOM_parameter_doc.short @@ -204,6 +204,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 99d7ff07a8..7a8a6461b2 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -971,6 +971,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.short b/ocean_only/single_column/EPBL/MOM_parameter_doc.short index 8291104fb8..1e0596e5f2 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.short +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.short @@ -218,6 +218,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index 86efc2d3ef..edfd2ffd05 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -971,6 +971,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.short b/ocean_only/single_column/KPP/MOM_parameter_doc.short index 1fccd5a6e8..ff5aa134f5 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.short +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.short @@ -218,6 +218,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index f6becd9b15..33d183c348 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -906,6 +906,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.short b/ocean_only/sloshing/layer/MOM_parameter_doc.short index 11e1aa5e82..e72f499f9d 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.short +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.short @@ -269,6 +269,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 6d600532d0..c80ece1013 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -1062,6 +1062,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.short b/ocean_only/sloshing/rho/MOM_parameter_doc.short index 89a30fa6f8..4cc436bab9 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.short +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.short @@ -317,6 +317,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 4ea4dc89be..6212fa48d4 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -1014,6 +1014,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.short b/ocean_only/sloshing/z/MOM_parameter_doc.short index b221986ab2..306fa6660b 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.short +++ b/ocean_only/sloshing/z/MOM_parameter_doc.short @@ -295,6 +295,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index dee3e49e59..effd4f68fa 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -889,6 +889,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.short b/ocean_only/torus_advection_test/MOM_parameter_doc.short index 146ccd0f25..a64700f94b 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.short +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.short @@ -237,6 +237,8 @@ KE_SCHEME = "KE_GUDONOV" ! default = "KE_ARAKAWA" ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index c79d964888..df42078ffc 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -1063,6 +1063,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short index 7cf8044f6b..47e7598f49 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short @@ -289,6 +289,8 @@ KE_SCHEME = "KE_GUDONOV" ! default = "KE_ARAKAWA" ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index b099aae51f..c0c548cbc6 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -1015,6 +1015,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short index 05070b48ad..2ce9971450 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short @@ -267,6 +267,8 @@ KE_SCHEME = "KE_GUDONOV" ! default = "KE_ARAKAWA" ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index 1ea91f6bce..b917026a4c 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -755,6 +755,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True USE_STANLEY_PGF = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in PGF code. +! === module MOM_Zanna_Bolton === +USE_ZB2020 = False ! [Boolean] default = False + ! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of + ! mesoscale eddies. + ! === module MOM_hor_visc === HOR_VISC_2018_ANSWERS = True ! [Boolean] default = True ! If true, use the order of arithmetic and expressions that recover the answers diff --git a/ocean_only/unit_tests/MOM_parameter_doc.short b/ocean_only/unit_tests/MOM_parameter_doc.short index 1788be7ded..1587e26014 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.short +++ b/ocean_only/unit_tests/MOM_parameter_doc.short @@ -123,6 +123,8 @@ SIMPLE_2ND_PPM_CONTINUITY = True ! [Boolean] default = False ! === module MOM_PressureForce_FV === +! === module MOM_Zanna_Bolton === + ! === module MOM_hor_visc === ! === module MOM_vert_friction === diff --git a/src/MOM6 b/src/MOM6 index 273da2fb27..7bb452bf9d 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 273da2fb272e37860c9617be3857aa8236a34f66 +Subproject commit 7bb452bf9d85af8ae8775917dfedf1ab7b043451 diff --git a/src/SIS2 b/src/SIS2 index 31ada5474b..88d9e32c14 160000 --- a/src/SIS2 +++ b/src/SIS2 @@ -1 +1 @@ -Subproject commit 31ada5474bf64c2d34ea323955e746597d142839 +Subproject commit 88d9e32c145124ac23a52a9df5a327c104d4ebdd