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 0ce52ffc2..8c83767a0 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 @@ -1388,7 +1388,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. KV_RESTRAT = 0.0 ! [m2 s-1] default = 0.0 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 712d69f75..2957bf469 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 @@ -359,7 +359,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === 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 1c5ff75fb..faf28dc89 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 @@ -1388,7 +1388,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. KV_RESTRAT = 0.0 ! [m2 s-1] default = 0.0 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 6a6c6980b..e57ed5060 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 @@ -335,7 +335,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === 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 8e2f8fab0..626541657 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 @@ -1388,7 +1388,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. KV_RESTRAT = 0.0 ! [m2 s-1] default = 0.0 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 bd0fd77f0..79dd91465 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 @@ -338,7 +338,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 2521663af..4d13b7343 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1388,7 +1388,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. KV_RESTRAT = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short index ef06fe50c..b3090b6ac 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short @@ -346,7 +346,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === 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 9d59a6974..952ec690d 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 @@ -1641,7 +1641,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. FOX_KEMPER_ML_RESTRAT_COEF2 = 0.0 ! [nondim] default = 0.0 @@ -1668,7 +1668,7 @@ MLE_MLD_DECAY_TIME2 = 0.0 ! [s] default = 0.0 ! to the current MLD. MLE_DENSITY_DIFF = 0.03 ! [kg/m3] default = 0.03 ! Density difference used to detect the mixed-layer depth used for the - ! mixed-layer eddy parameterization by Fox-Kemper et al. (2010) + ! mixed-layer eddy parameterization by Fox-Kemper et al. (2011) MLE_TAIL_DH = 0.0 ! [nondim] default = 0.0 ! Fraction by which to extend the mixed-layer restratification depth used for a ! smoother stream function at the base of the mixed-layer. 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 21b91bc55..397a77925 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 @@ -392,7 +392,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === 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 2657e580d..277b1207c 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -1654,7 +1654,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. FOX_KEMPER_ML_RESTRAT_COEF2 = 0.0 ! [nondim] default = 0.0 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 af49f27ef..f4b4b0a47 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short @@ -495,7 +495,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) MLE_FRONT_LENGTH = 500.0 ! [m] default = 0.0 ! If non-zero, is the frontal-length scale used to calculate the upscaling of ! buoyancy gradients that is otherwise represented by the parameter 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 b91e6c829..3e6c4c25b 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -1673,7 +1673,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. FOX_KEMPER_ML_RESTRAT_COEF2 = 0.0 ! [nondim] default = 0.0 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 6acf13a69..4f31c676d 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short @@ -523,7 +523,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) MLE_FRONT_LENGTH = 200.0 ! [m] default = 0.0 ! If non-zero, is the frontal-length scale used to calculate the upscaling of ! buoyancy gradients that is otherwise represented by the parameter diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 718909d49..b6cd82476 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1654,7 +1654,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. FOX_KEMPER_ML_RESTRAT_COEF2 = 0.0 ! [nondim] default = 0.0 diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index dd8333b6d..86086b00b 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -502,7 +502,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) MLE_FRONT_LENGTH = 500.0 ! [m] default = 0.0 ! If non-zero, is the frontal-length scale used to calculate the upscaling of ! buoyancy gradients that is otherwise represented by the parameter diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 844b38d10..167e89500 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1673,7 +1673,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. FOX_KEMPER_ML_RESTRAT_COEF2 = 0.0 ! [nondim] default = 0.0 diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index fdacde6d4..b9d6a926b 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -528,7 +528,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) MLE_FRONT_LENGTH = 200.0 ! [m] default = 0.0 ! If non-zero, is the frontal-length scale used to calculate the upscaling of ! buoyancy gradients that is otherwise represented by the parameter diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index 601b1945b..ff86bd72e 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -1644,7 +1644,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 60.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. FOX_KEMPER_ML_RESTRAT_COEF2 = 0.0 ! [nondim] default = 0.0 diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short index e3e447e44..719a7bde0 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short @@ -531,7 +531,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 60.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) MLE_USE_PBL_MLD = True ! [Boolean] default = False ! If true, the MLE parameterization will use the mixed-layer depth provided by ! the active PBL parameterization. If false, MLE will estimate a MLD based on a diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 90ee0b8ae..aaf60f5b3 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1354,7 +1354,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. KV_RESTRAT = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short index 33e3dd1d0..cac1b7198 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short @@ -373,7 +373,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === 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 78e692ece..ff3f1875c 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1354,7 +1354,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. KV_RESTRAT = 0.0 ! [m2 s-1] default = 0.0 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 19b279c56..84320a23f 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short @@ -373,7 +373,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index aadf9fdc2..730341bde 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1354,7 +1354,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. KV_RESTRAT = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short index 1f353d283..4127095d2 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short @@ -373,7 +373,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 0d03edf65..88e2bd0ff 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -1267,7 +1267,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 5.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. KV_RESTRAT = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/benchmark/MOM_parameter_doc.short b/ocean_only/benchmark/MOM_parameter_doc.short index 8d2ff878f..e51170a19 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.short +++ b/ocean_only/benchmark/MOM_parameter_doc.short @@ -349,7 +349,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 5.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index e24037705..b04aaac5c 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1691,7 +1691,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. FOX_KEMPER_ML_RESTRAT_COEF2 = 0.0 ! [nondim] default = 0.0 @@ -1718,7 +1718,7 @@ MLE_MLD_DECAY_TIME2 = 0.0 ! [s] default = 0.0 ! to the current MLD. MLE_DENSITY_DIFF = 0.03 ! [kg/m3] default = 0.03 ! Density difference used to detect the mixed-layer depth used for the - ! mixed-layer eddy parameterization by Fox-Kemper et al. (2010) + ! mixed-layer eddy parameterization by Fox-Kemper et al. (2011) MLE_TAIL_DH = 0.0 ! [nondim] default = 0.0 ! Fraction by which to extend the mixed-layer restratification depth used for a ! smoother stream function at the base of the mixed-layer. diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short index 7568236c1..36bf03da1 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short @@ -410,7 +410,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 61d3b911e..6bd4d4330 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1565,7 +1565,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. KV_RESTRAT = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.short b/ocean_only/global_ALE/layer/MOM_parameter_doc.short index b0d5da1dc..d94b3d6c1 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.short @@ -330,7 +330,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 0d1728f79..8a0397fac 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1638,7 +1638,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. FOX_KEMPER_ML_RESTRAT_COEF2 = 0.0 ! [nondim] default = 0.0 @@ -1665,7 +1665,7 @@ MLE_MLD_DECAY_TIME2 = 0.0 ! [s] default = 0.0 ! to the current MLD. MLE_DENSITY_DIFF = 0.03 ! [kg/m3] default = 0.03 ! Density difference used to detect the mixed-layer depth used for the - ! mixed-layer eddy parameterization by Fox-Kemper et al. (2010) + ! mixed-layer eddy parameterization by Fox-Kemper et al. (2011) MLE_TAIL_DH = 0.0 ! [nondim] default = 0.0 ! Fraction by which to extend the mixed-layer restratification depth used for a ! smoother stream function at the base of the mixed-layer. diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.short b/ocean_only/global_ALE/z/MOM_parameter_doc.short index 01e883d25..ddee84c64 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.short @@ -385,7 +385,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === 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 beee2967e..bd4660e30 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -1278,7 +1278,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 10.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. FOX_KEMPER_ML_RESTRAT_COEF2 = 0.0 ! [nondim] default = 0.0 @@ -1305,7 +1305,7 @@ MLE_MLD_DECAY_TIME2 = 0.0 ! [s] default = 0.0 ! to the current MLD. MLE_DENSITY_DIFF = 0.03 ! [kg/m3] default = 0.03 ! Density difference used to detect the mixed-layer depth used for the - ! mixed-layer eddy parameterization by Fox-Kemper et al. (2010) + ! mixed-layer eddy parameterization by Fox-Kemper et al. (2011) MLE_TAIL_DH = 0.0 ! [nondim] default = 0.0 ! Fraction by which to extend the mixed-layer restratification depth used for a ! smoother stream function at the base of the mixed-layer. 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 767513aad..d49f174f0 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short @@ -353,7 +353,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 10.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 804f93b18..18df9435f 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1382,7 +1382,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) USE_STANLEY_ML = False ! [Boolean] default = False ! If true, turn on Stanley SGS T variance parameterization in ML restrat code. KV_RESTRAT = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.short b/ocean_only/nonBous_global/MOM_parameter_doc.short index e4f9508cf..58d271ca2 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.short +++ b/ocean_only/nonBous_global/MOM_parameter_doc.short @@ -377,7 +377,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! instabilities, times the minimum of the ratio of the mesoscale eddy kinetic ! energy to the large-scale geostrophic kinetic energy or 1 plus the square of ! the grid spacing over the deformation radius, as detailed by Fox-Kemper et al. - ! (2010) + ! (2011) ! === module MOM_diagnostics === diff --git a/src/MOM6 b/src/MOM6 index caae65386..4f1ecf4dd 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit caae6538680d747e924a81e78b314d4fccef6dae +Subproject commit 4f1ecf4dd6b6f895ac81d8da55b2dde651161663