diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index cfc1ed1782..2e99597b51 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -1234,7 +1234,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short index 6167b97d6b..03e44c0983 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short @@ -393,7 +393,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 0c1bf645e1..85e3d402e1 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 @@ -1230,7 +1230,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 47d213f047..5e16ed5d58 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 @@ -389,7 +389,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 0c1bf645e1..85e3d402e1 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 @@ -1230,7 +1230,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 47d213f047..5e16ed5d58 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 @@ -389,7 +389,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index a7cb133d15..6612684aed 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1230,7 +1230,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short index 1997b7f59b..8effe63ce9 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short @@ -401,7 +401,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 34bb7c8e47..4be3519b46 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 @@ -1458,7 +1458,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 1b309f0ef6..365fcab734 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 @@ -467,7 +467,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 786260fc98..87aa0e7f56 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -1471,7 +1471,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 4d76108795..522be3c75b 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short @@ -578,7 +578,7 @@ EPBL_IS_ADDITIVE = False ! [Boolean] default = True ! other diffusivities. Otherwise, the larger of kappa- ! shear and ePBL diffusivities are used. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 70ca3ea56f..83b0fe8598 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -1484,7 +1484,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 bee1feb7c5..7da7ec4b38 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short @@ -603,7 +603,7 @@ EPBL_IS_ADDITIVE = False ! [Boolean] default = True ! other diffusivities. Otherwise, the larger of kappa- ! shear and ePBL diffusivities are used. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index f092968940..97e53772f9 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1471,7 +1471,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index 96e873bdb7..46f8b0ec8f 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -587,7 +587,7 @@ EPBL_IS_ADDITIVE = False ! [Boolean] default = True ! other diffusivities. Otherwise, the larger of kappa- ! shear and ePBL diffusivities are used. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 77fffd6540..0b2cc5350e 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1490,7 +1490,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index 21e4b20400..b2f25ece0d 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -617,7 +617,7 @@ EPBL_IS_ADDITIVE = False ! [Boolean] default = True ! other diffusivities. Otherwise, the larger of kappa- ! shear and ePBL diffusivities are used. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 1aaae0d3b8..ad95477bb1 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1247,7 +1247,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short index 0f07d49325..ce501f9632 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short @@ -424,7 +424,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 89d4c66397..b00b733339 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1247,7 +1247,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 6158be0663..dffff0a47a 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short @@ -424,7 +424,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 89d4c66397..b00b733339 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1247,7 +1247,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short index 6158be0663..dffff0a47a 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short @@ -424,7 +424,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index f24292d7eb..53e0587f63 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -1389,7 +1389,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short index 2549a3a52c..9bba54fde6 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short @@ -491,7 +491,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 d2a8bb3dfa..77075b7943 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 @@ -911,7 +911,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 d82cf7bd49..c1a8d373fb 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 @@ -309,7 +309,7 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 144761ef39..50acd73b96 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 dfd6170d4b..75f71ebe09 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 @@ -335,7 +335,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 1c6404e22a..caca98492e 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -1013,9 +1013,9 @@ APPLY_NONLOCAL_TRANSPORT = True ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -1023,9 +1023,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "cubic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False 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 94d40d16e2..a09a5439e2 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 @@ -331,13 +331,16 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False ! If true, turns on the [CVMix] KPP scheme of Large et al., 1994, ! to calculate diffusivities and non-local transport in the OBL. KPP% +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. %KPP ! === module MOM_tidal_mixing === 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 c6a2292e30..93bab30558 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 @@ -911,7 +911,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 1c7838c889..7d548436e0 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 @@ -309,7 +309,7 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 8d87b98b0a..bbc7fc063e 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 247e33ce7f..cc8c952519 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 @@ -335,7 +335,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 89c9862b94..383c36a0ac 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -1013,9 +1013,9 @@ APPLY_NONLOCAL_TRANSPORT = True ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -1023,9 +1023,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "cubic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False 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 baa29ef57c..c393d29834 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 @@ -331,13 +331,16 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False ! If true, turns on the [CVMix] KPP scheme of Large et al., 1994, ! to calculate diffusivities and non-local transport in the OBL. KPP% +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. %KPP ! === module MOM_tidal_mixing === 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 1b920ac556..367d40415d 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 @@ -911,7 +911,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 3056a57a3b..3d4b9361dc 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 @@ -309,7 +309,7 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 e5655c63b7..93afd437a1 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 54e730a522..2977f10bcd 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 @@ -335,7 +335,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 4566f8080c..69386a6697 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -1013,9 +1013,9 @@ APPLY_NONLOCAL_TRANSPORT = True ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -1023,9 +1023,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "cubic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False 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 737aa09a94..310325a92b 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 @@ -331,13 +331,16 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False ! If true, turns on the [CVMix] KPP scheme of Large et al., 1994, ! to calculate diffusivities and non-local transport in the OBL. KPP% +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. %KPP ! === module MOM_tidal_mixing === 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 d73322003e..98713ac6b2 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 @@ -911,7 +911,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 e9d8d61c4a..df1827cf15 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 @@ -309,7 +309,7 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 d5e9feec39..8fb19803b0 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 a350bf9a22..11c818bfa3 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 @@ -335,7 +335,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 e2d9f76900..e4955848a6 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -1013,9 +1013,9 @@ APPLY_NONLOCAL_TRANSPORT = True ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -1023,9 +1023,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "cubic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False 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 988d7dd237..6239e7a280 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 @@ -331,13 +331,16 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False ! If true, turns on the [CVMix] KPP scheme of Large et al., 1994, ! to calculate diffusivities and non-local transport in the OBL. KPP% +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. %KPP ! === module MOM_tidal_mixing === diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 2db0b722e6..703d63fb61 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -1064,7 +1064,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/DOME/MOM_parameter_doc.short b/ocean_only/DOME/MOM_parameter_doc.short index ad42971c61..90d4e8bb76 100644 --- a/ocean_only/DOME/MOM_parameter_doc.short +++ b/ocean_only/DOME/MOM_parameter_doc.short @@ -353,7 +353,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index 4ba75081c1..272fd60fba 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -1041,7 +1041,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.short b/ocean_only/Phillips_2layer/MOM_parameter_doc.short index 7006b5b29f..e2fba74f90 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.short +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.short @@ -376,7 +376,7 @@ KHTH = 8000.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/SCM_idealized_hurricane/MOM_input b/ocean_only/SCM_idealized_hurricane/MOM_input index 381cdee8c4..e9b927f8ae 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_input +++ b/ocean_only/SCM_idealized_hurricane/MOM_input @@ -341,6 +341,9 @@ APPLY_NONLOCAL_TRANSPORT = False ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. %KPP ! === module MOM_diffConvection === diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 9f46afed04..7e3d6f2249 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -997,7 +997,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -1010,9 +1010,9 @@ APPLY_NONLOCAL_TRANSPORT = False ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -1020,9 +1020,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "cubic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short index c75fbce931..a0e644926e 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short @@ -330,7 +330,7 @@ MAXVEL = 6.0 ! [m s-1] default = 3.0E+08 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -341,6 +341,9 @@ APPLY_NONLOCAL_TRANSPORT = False ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. %KPP ! === module MOM_tidal_mixing === diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index e73c0218c0..f7844bcaa6 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -1108,7 +1108,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short index 9ec02ef724..d01b2bd3e0 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short @@ -377,7 +377,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 20b88090ca..9353a9c667 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -1239,7 +1239,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short index d432268706..440c56d470 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short @@ -425,7 +425,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 7b25b91798..0160e19913 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -1193,7 +1193,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.short b/ocean_only/adjustment2d/z/MOM_parameter_doc.short index 376ca463e6..6123b39445 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.short @@ -401,7 +401,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index f98806923c..5f486224e4 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -1183,7 +1183,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/benchmark/MOM_parameter_doc.short b/ocean_only/benchmark/MOM_parameter_doc.short index f833c71281..5944fbce1b 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.short +++ b/ocean_only/benchmark/MOM_parameter_doc.short @@ -393,7 +393,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 5.0 ! [nondim] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index ec4a84461b..9eacc168c1 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -1143,7 +1143,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.short b/ocean_only/circle_obcs/MOM_parameter_doc.short index 043460994f..f3ec365ec1 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.short +++ b/ocean_only/circle_obcs/MOM_parameter_doc.short @@ -351,7 +351,7 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index bd2c83516b..c7b4034699 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -1089,7 +1089,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/external_gwave/MOM_parameter_doc.short b/ocean_only/external_gwave/MOM_parameter_doc.short index 78eec450f9..46856c1dc6 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.short +++ b/ocean_only/external_gwave/MOM_parameter_doc.short @@ -356,7 +356,7 @@ DTBT = 20.0 ! [s or nondim] default = -0.98 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 7b2d7bac07..5a53cc4403 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -1100,7 +1100,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short index 0d161b1acb..fb15c53b71 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short @@ -374,7 +374,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index 2a2953c7f1..74c2d513d5 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -1233,7 +1233,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short index 5a67afb3d6..0ec71faada 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short @@ -424,7 +424,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 0655e4b68f..2c5125827c 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -1187,7 +1187,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short index c5c3bb8772..6b45e11fdf 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short @@ -397,7 +397,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 08bb703cc5..78a692cdfb 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -1187,7 +1187,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.short b/ocean_only/flow_downslope/z/MOM_parameter_doc.short index 42f5efb13b..0f2257549b 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.short @@ -397,7 +397,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 1086937129..44b8c90381 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1502,7 +1502,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short index 940415d8c6..fa49938812 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short @@ -493,7 +493,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 685713e1cb..deeaf93581 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1333,7 +1333,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.short b/ocean_only/global_ALE/layer/MOM_parameter_doc.short index 9c656ca506..bd907940ec 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.short @@ -405,7 +405,7 @@ Z_OUTPUT_GRID_FILE = "analysis_vgrid_lev35.v1.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index 7331d7832b..1644828258 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -2041,6 +2041,70 @@ ! long_name: Layer entrainment from below per timestep ! units: m ! cell_methods: z_l:mean +"ocean_model", "ea_t" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "ea_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "ea_t" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "ea_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: z_l:mean +"ocean_model", "eb_t" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "eb_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "eb_t" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "eb_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: z_l:mean +"ocean_model", "ea_s" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "ea_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "ea_s" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "ea_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: z_l:mean +"ocean_model", "eb_s" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "eb_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "eb_s" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "eb_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: z_l:mean "ocean_model", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing ! units: m s-2 @@ -2073,22 +2137,6 @@ ! long_name: Meridional Acceleration from Diapycnal Mixing ! units: m s-2 ! cell_methods: z_l:mean -"ocean_model", "wd" [Used] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: xh:mean yh:mean zi:point area:mean -"ocean_model", "wd_xyave" [Unused] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: zi:point -"ocean_model_z", "wd" [Unused] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: xh:mean yh:mean z_i:point area:mean -"ocean_model_z", "wd_xyave" [Unused] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: z_i:point "ocean_model", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces ! units: degC m s-1 diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index cbf8619194..5f4e29cdda 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1454,7 +1454,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.short b/ocean_only/global_ALE/z/MOM_parameter_doc.short index 3d95fb90b0..23d10fe0b6 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.short @@ -467,7 +467,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 15c4223165..0487fa6d3e 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -2081,6 +2081,70 @@ ! long_name: Layer entrainment from below per timestep ! units: m ! cell_methods: z_l:mean +"ocean_model", "ea_t" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "ea_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "ea_t" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "ea_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: z_l:mean +"ocean_model", "eb_t" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "eb_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "eb_t" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "eb_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: z_l:mean +"ocean_model", "ea_s" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "ea_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "ea_s" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "ea_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: z_l:mean +"ocean_model", "eb_s" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "eb_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "eb_s" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "eb_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: z_l:mean "ocean_model", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing ! units: m s-2 @@ -2113,22 +2177,6 @@ ! long_name: Meridional Acceleration from Diapycnal Mixing ! units: m s-2 ! cell_methods: z_l:mean -"ocean_model", "wd" [Used] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: xh:mean yh:mean zi:point area:mean -"ocean_model", "wd_xyave" [Unused] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: zi:point -"ocean_model_z", "wd" [Unused] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: xh:mean yh:mean z_i:point area:mean -"ocean_model_z", "wd_xyave" [Unused] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: z_i:point "ocean_model", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces ! units: degC m s-1 diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 3f33e81580..987e8af642 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -1092,7 +1092,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.short b/ocean_only/lock_exchange/MOM_parameter_doc.short index d473f1ec66..d88e821011 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.short +++ b/ocean_only/lock_exchange/MOM_parameter_doc.short @@ -338,7 +338,7 @@ DTBT = 25.0 ! [s or nondim] default = -0.98 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 bb9e6b1a9a..41e27430e6 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -1221,7 +1221,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False 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 71402000ca..4f6dcf42bd 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short @@ -391,7 +391,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 10.0 ! [nondim] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 2476290752..f3ca7b0862 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1253,7 +1253,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.short b/ocean_only/nonBous_global/MOM_parameter_doc.short index 5ab3a72e46..75aa53fdd1 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.short +++ b/ocean_only/nonBous_global/MOM_parameter_doc.short @@ -430,7 +430,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index e2c1c0f0f5..d0a77fce46 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -1089,7 +1089,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/resting/layer/MOM_parameter_doc.short b/ocean_only/resting/layer/MOM_parameter_doc.short index aba7b59fe9..9a3963b315 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.short +++ b/ocean_only/resting/layer/MOM_parameter_doc.short @@ -355,7 +355,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 9c9a52ba3a..b4a4e6d37e 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -1176,7 +1176,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/resting/z/MOM_parameter_doc.short b/ocean_only/resting/z/MOM_parameter_doc.short index 6b2c8d75ac..95735a41fd 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.short +++ b/ocean_only/resting/z/MOM_parameter_doc.short @@ -368,7 +368,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 80354b683a..8654ccfda2 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -1120,7 +1120,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.short b/ocean_only/seamount/layer/MOM_parameter_doc.short index fb1f7d9ce3..c56a8892c7 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.short +++ b/ocean_only/seamount/layer/MOM_parameter_doc.short @@ -370,7 +370,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 2969eb5844..cb53883260 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -1251,7 +1251,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.short b/ocean_only/seamount/rho/MOM_parameter_doc.short index 7af86584d3..af98516d44 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.short +++ b/ocean_only/seamount/rho/MOM_parameter_doc.short @@ -422,7 +422,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 9b4d2327fc..fb9cc2f98a 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -1205,7 +1205,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.short b/ocean_only/seamount/sigma/MOM_parameter_doc.short index c5c32f81a7..9babed0042 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.short +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.short @@ -394,7 +394,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 1df3edf1d1..b9994e43c2 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -1205,7 +1205,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/seamount/z/MOM_parameter_doc.short b/ocean_only/seamount/z/MOM_parameter_doc.short index 139f498e13..263ccfdb6b 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.short +++ b/ocean_only/seamount/z/MOM_parameter_doc.short @@ -394,7 +394,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index 8b58436d0e..f55651726d 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -889,7 +889,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.short b/ocean_only/single_column/BML/MOM_parameter_doc.short index 91d18b34e6..4b5ecd6238 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.short +++ b/ocean_only/single_column/BML/MOM_parameter_doc.short @@ -267,7 +267,7 @@ Z_OUTPUT_GRID_FILE = "../zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index f8f836b7f2..56de7e47da 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -969,7 +969,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -982,9 +982,9 @@ APPLY_NONLOCAL_TRANSPORT = False ! [Boolean] default = False ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -992,9 +992,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "quadratic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.short b/ocean_only/single_column/EPBL/MOM_parameter_doc.short index f3b1ac7d6a..7238d47325 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.short +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.short @@ -310,7 +310,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index d27345e8d8..3783455afa 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -969,7 +969,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -982,9 +982,9 @@ APPLY_NONLOCAL_TRANSPORT = True ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -992,9 +992,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "cubic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.short b/ocean_only/single_column/KPP/MOM_parameter_doc.short index 52db309f97..5201192336 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.short +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.short @@ -306,13 +306,16 @@ Z_OUTPUT_GRID_FILE = "../zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False ! If true, turns on the [CVMix] KPP scheme of Large et al., 1994, ! to calculate diffusivities and non-local transport in the OBL. KPP% +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. NLT_SHAPE = "PARABOLIC" ! default = "CVMix" ! MOM6 method to set nonlocal transport profile. ! Over-rides the result from CVMix. Allowed values are: diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 4d811cb9d6..8a718cbc02 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -1095,7 +1095,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.short b/ocean_only/sloshing/layer/MOM_parameter_doc.short index dec84ff828..6758922043 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.short +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.short @@ -364,7 +364,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 98e233d77e..b1bce7543d 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -1228,7 +1228,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.short b/ocean_only/sloshing/rho/MOM_parameter_doc.short index 13f138cbf4..c5e2467c0f 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.short +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.short @@ -411,7 +411,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 682909f6c0..1c3fc017c3 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -1182,7 +1182,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.short b/ocean_only/sloshing/z/MOM_parameter_doc.short index 735e6927c2..8e94391b9d 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.short +++ b/ocean_only/sloshing/z/MOM_parameter_doc.short @@ -387,7 +387,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index 93b1eb8394..dd01bbf5db 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -1094,7 +1094,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.short b/ocean_only/torus_advection_test/MOM_parameter_doc.short index 19b73113c3..4137944da5 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.short +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.short @@ -359,7 +359,7 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 631647c082..a3f8ce9cc7 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -1240,7 +1240,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short index a74a01a20d..8ca51ae50c 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short @@ -420,7 +420,7 @@ DTBT = 5.0 ! [s or nondim] default = -0.98 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index c80972482e..4dbfa0c133 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -1194,7 +1194,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short index d7d5a53de0..7a3c55fce9 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short @@ -396,7 +396,7 @@ DTBT = 5.0 ! [s or nondim] default = -0.98 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/src/MOM6 b/src/MOM6 index 44751870a6..ee3221ec32 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 44751870a6b1ea390714fe8e782a9879282353dd +Subproject commit ee3221ec3293e2669f7ad123f55abb720d129665