diff --git a/exps/NEP10.COBALT/MOM_parameter_doc.all b/exps/NEP10.COBALT/MOM_parameter_doc.all index b678c0a16..902d384a4 100644 --- a/exps/NEP10.COBALT/MOM_parameter_doc.all +++ b/exps/NEP10.COBALT/MOM_parameter_doc.all @@ -382,7 +382,7 @@ OBC_TIDE_ADD_NODAL = True ! [Boolean] default = False ! If true, include 18.6 year nodal modulation in the boundary tidal forcing. OBC_TIDE_REF_DATE = 1993, 1, 1 ! ! Reference date to use for tidal calculations and equilibrium phase. -OBC_TIDE_NODAL_REF_DATE = 1993, 7, 2 ! default = 0 +OBC_TIDE_NODAL_REF_DATE = 1993, 7, 2 ! default = 0, 0, 0 ! Fixed reference date to use for nodal modulation of boundary tides. TIDE_M2_FREQ = 1.405189E-04 ! [rad s-1] default = 1.405189E-04 ! Frequency of the M2 tidal constituent. This is only used if TIDES and TIDE_M2 @@ -1138,7 +1138,7 @@ TIDAL_SAL_FROM_FILE = False ! [Boolean] default = False USE_PREVIOUS_TIDES = False ! [Boolean] default = False ! If true, use the SAL from the previous iteration of the tides to facilitate ! convergent iteration. This is only used if TIDES is true. -TIDE_REF_DATE = 1993, 1, 1 ! default = 0 +TIDE_REF_DATE = 1993, 1, 1 ! default = 0, 0, 0 ! Year,month,day to use as reference date for tidal forcing. If not specified, ! defaults to 0. TIDE_USE_EQ_PHASE = True ! [Boolean] default = False @@ -1951,6 +1951,11 @@ MKE_TO_TKE_EFFIC = 0.0 ! [nondim] default = 0.0 TKE_DECAY = 0.001 ! [nondim] default = 2.5 ! TKE_DECAY relates the vertical rate of decay of the TKE available for ! mechanical entrainment to the natural Ekman depth. +DIRECT_EPBL_MIXING_CALC = False ! [Boolean] default = False + ! If true and there is no conversion from mean kinetic energy to ePBL turbulent + ! kinetic energy, use a direct calculation of the diffusivity that is supported + ! by a given energy input instead of the more general but slower iterative + ! solver. EPBL_MSTAR_SCHEME = "REICHL_H18" ! default = "CONSTANT" ! EPBL_MSTAR_SCHEME selects the method for setting mstar. Valid values are: ! CONSTANT - Use a fixed mstar given by MSTAR @@ -1960,7 +1965,7 @@ MSTAR_CAP = 10.0 ! [nondim] default = -1.0 ! If this value is positive, it sets the maximum value of mstar allowed in ePBL. ! (This is not used if EPBL_MSTAR_SCHEME = CONSTANT). RH18_MSTAR_CN1 = 0.275 ! [nondim] default = 0.275 - ! MSTAR_N coefficient 1 (outter-most coefficient for fit). The value of 0.275 is + ! MSTAR_N coefficient 1 (outer-most coefficient for fit). The value of 0.275 is ! given in RH18. Increasing this coefficient increases MSTAR for all values of ! Hf/ust, but more effectively at low values (weakly developed OSBLs). RH18_MSTAR_CN2 = 8.0 ! [nondim] default = 8.0 @@ -2005,10 +2010,13 @@ EPBL_MLD_BISECTION = True ! [Boolean] default = False ! mixed layer depth. Otherwise use the false position after a maximum and ! minimum bound have been evaluated and the returned value or bisection before ! this. +EPBL_MLD_ITER_BUG = True ! [Boolean] default = True + ! If true, use buggy logic that gives the wrong bounds for the next iteration + ! when successive guesses increase by exactly EPBL_MLD_TOLERANCE. EPBL_MLD_MAX_ITS = 20 ! default = 20 ! The maximum number of iterations that can be used to find a self-consistent - ! mixed layer depth. If EPBL_MLD_BISECTION is true, the maximum number - ! iteractions needed is set by Depth/2^MAX_ITS < EPBL_MLD_TOLERANCE. + ! mixed layer depth. If EPBL_MLD_BISECTION is true, the maximum number of + ! iterations needed is set by Depth/2^MAX_ITS < EPBL_MLD_TOLERANCE. EPBL_MIN_MIX_LEN = 0.0 ! [meter] default = 0.0 ! The minimum mixing length scale that will be used by ePBL. The default (0) ! does not set a minimum. @@ -2031,6 +2039,9 @@ EPBL_VEL_SCALE_FACTOR = 0.5477 ! [nondim] default = 1.0 ! the PBL diffusivity. VSTAR_SURF_FAC = 1.8258 ! [nondim] default = 1.2 ! The proportionality times ustar to set vstar at the surface. +EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a + ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. USE_LA_LI2016 = True ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. @@ -2040,12 +2051,12 @@ EPBL_LANGMUIR_SCHEME = "ADDITIVE" ! default = "NONE" ! NONE - Do not do any extra mixing due to Langmuir turbulence ! RESCALE - Use a multiplicative rescaling of mstar to account for Langmuir ! turbulence - ! ADDITIVE - Add a Langmuir turblence contribution to mstar to other + ! ADDITIVE - Add a Langmuir turbulence contribution to mstar to other ! contributions LT_ENHANCE_COEF = 0.1056 ! [nondim] default = 0.447 ! Coefficient for Langmuir enhancement of mstar LT_ENHANCE_EXP = -1.0 ! [nondim] default = -1.33 - ! Exponent for Langmuir enhancementt of mstar + ! Exponent for Langmuir enhancement of mstar LT_MOD_LAC1 = 0.0 ! [nondim] default = -0.87 ! Coefficient for modification of Langmuir number due to MLD approaching Ekman ! depth. @@ -2061,6 +2072,10 @@ LT_MOD_LAC4 = 0.8 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.8 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ratio of Ekman to ! unstable Obukhov depth. +EPBL_OPTIONS_DIFF = 0 ! default = 0 + ! If positive, this is a coded integer indicating a pair of settings whose + ! differences are diagnosed in a passive diagnostic mode via extra calls to + ! ePBL_column. If this is 0 or negative no extra calls occur. !EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ePBL code, derived from ! OMEGA and ANGSTROM. diff --git a/exps/NEP10.COBALT/MOM_parameter_doc.layout b/exps/NEP10.COBALT/MOM_parameter_doc.layout index d510cf4da..5d0f895c4 100644 --- a/exps/NEP10.COBALT/MOM_parameter_doc.layout +++ b/exps/NEP10.COBALT/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 56 ! ! in MOM_memory.h at compile time. LAYOUT = 20, 56 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/exps/NEP10.COBALT/MOM_parameter_doc.short b/exps/NEP10.COBALT/MOM_parameter_doc.short index 12acf1559..b2e413800 100644 --- a/exps/NEP10.COBALT/MOM_parameter_doc.short +++ b/exps/NEP10.COBALT/MOM_parameter_doc.short @@ -167,7 +167,7 @@ OBC_TIDE_ADD_NODAL = True ! [Boolean] default = False ! If true, include 18.6 year nodal modulation in the boundary tidal forcing. OBC_TIDE_REF_DATE = 1993, 1, 1 ! ! Reference date to use for tidal calculations and equilibrium phase. -OBC_TIDE_NODAL_REF_DATE = 1993, 7, 2 ! default = 0 +OBC_TIDE_NODAL_REF_DATE = 1993, 7, 2 ! default = 0, 0, 0 ! Fixed reference date to use for nodal modulation of boundary tides. ! === module MOM_verticalGrid === @@ -391,7 +391,7 @@ TIDE_MF = True ! [Boolean] default = False TIDE_MM = True ! [Boolean] default = False ! If true, apply tidal momentum forcing at the MM frequency. This is only used ! if TIDES is true. -TIDE_REF_DATE = 1993, 1, 1 ! default = 0 +TIDE_REF_DATE = 1993, 1, 1 ! default = 0, 0, 0 ! Year,month,day to use as reference date for tidal forcing. If not specified, ! defaults to 0. TIDE_USE_EQ_PHASE = True ! [Boolean] default = False @@ -653,12 +653,12 @@ EPBL_LANGMUIR_SCHEME = "ADDITIVE" ! default = "NONE" ! NONE - Do not do any extra mixing due to Langmuir turbulence ! RESCALE - Use a multiplicative rescaling of mstar to account for Langmuir ! turbulence - ! ADDITIVE - Add a Langmuir turblence contribution to mstar to other + ! ADDITIVE - Add a Langmuir turbulence contribution to mstar to other ! contributions LT_ENHANCE_COEF = 0.1056 ! [nondim] default = 0.447 ! Coefficient for Langmuir enhancement of mstar LT_ENHANCE_EXP = -1.0 ! [nondim] default = -1.33 - ! Exponent for Langmuir enhancementt of mstar + ! Exponent for Langmuir enhancement of mstar LT_MOD_LAC1 = 0.0 ! [nondim] default = -0.87 ! Coefficient for modification of Langmuir number due to MLD approaching Ekman ! depth. diff --git a/exps/NEP10.COBALT/SIS_parameter_doc.layout b/exps/NEP10.COBALT/SIS_parameter_doc.layout index 403ff12eb..cb376982a 100644 --- a/exps/NEP10.COBALT/SIS_parameter_doc.layout +++ b/exps/NEP10.COBALT/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 56 ! ! in SIS2_memory.h at compile time. LAYOUT = 20, 56 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/exps/NWA12.COBALT/MOM_parameter_doc.all b/exps/NWA12.COBALT/MOM_parameter_doc.all index 1f8653596..54831c1e5 100644 --- a/exps/NWA12.COBALT/MOM_parameter_doc.all +++ b/exps/NWA12.COBALT/MOM_parameter_doc.all @@ -376,7 +376,7 @@ OBC_TIDE_ADD_NODAL = True ! [Boolean] default = False ! If true, include 18.6 year nodal modulation in the boundary tidal forcing. OBC_TIDE_REF_DATE = 1993, 1, 1 ! ! Reference date to use for tidal calculations and equilibrium phase. -OBC_TIDE_NODAL_REF_DATE = 1993, 7, 2 ! default = 0 +OBC_TIDE_NODAL_REF_DATE = 1993, 7, 2 ! default = 0, 0, 0 ! Fixed reference date to use for nodal modulation of boundary tides. TIDE_M2_FREQ = 1.405189E-04 ! [rad s-1] default = 1.405189E-04 ! Frequency of the M2 tidal constituent. This is only used if TIDES and TIDE_M2 @@ -1150,7 +1150,7 @@ TIDAL_SAL_FROM_FILE = False ! [Boolean] default = False USE_PREVIOUS_TIDES = False ! [Boolean] default = False ! If true, use the SAL from the previous iteration of the tides to facilitate ! convergent iteration. This is only used if TIDES is true. -TIDE_REF_DATE = 1993, 1, 1 ! default = 0 +TIDE_REF_DATE = 1993, 1, 1 ! default = 0, 0, 0 ! Year,month,day to use as reference date for tidal forcing. If not specified, ! defaults to 0. TIDE_USE_EQ_PHASE = True ! [Boolean] default = False @@ -1983,6 +1983,11 @@ MKE_TO_TKE_EFFIC = 0.0 ! [nondim] default = 0.0 TKE_DECAY = 0.001 ! [nondim] default = 2.5 ! TKE_DECAY relates the vertical rate of decay of the TKE available for ! mechanical entrainment to the natural Ekman depth. +DIRECT_EPBL_MIXING_CALC = False ! [Boolean] default = False + ! If true and there is no conversion from mean kinetic energy to ePBL turbulent + ! kinetic energy, use a direct calculation of the diffusivity that is supported + ! by a given energy input instead of the more general but slower iterative + ! solver. EPBL_MSTAR_SCHEME = "REICHL_H18" ! default = "CONSTANT" ! EPBL_MSTAR_SCHEME selects the method for setting mstar. Valid values are: ! CONSTANT - Use a fixed mstar given by MSTAR @@ -1992,7 +1997,7 @@ MSTAR_CAP = 10.0 ! [nondim] default = -1.0 ! If this value is positive, it sets the maximum value of mstar allowed in ePBL. ! (This is not used if EPBL_MSTAR_SCHEME = CONSTANT). RH18_MSTAR_CN1 = 0.275 ! [nondim] default = 0.275 - ! MSTAR_N coefficient 1 (outter-most coefficient for fit). The value of 0.275 is + ! MSTAR_N coefficient 1 (outer-most coefficient for fit). The value of 0.275 is ! given in RH18. Increasing this coefficient increases MSTAR for all values of ! Hf/ust, but more effectively at low values (weakly developed OSBLs). RH18_MSTAR_CN2 = 8.0 ! [nondim] default = 8.0 @@ -2037,10 +2042,13 @@ EPBL_MLD_BISECTION = True ! [Boolean] default = False ! mixed layer depth. Otherwise use the false position after a maximum and ! minimum bound have been evaluated and the returned value or bisection before ! this. +EPBL_MLD_ITER_BUG = True ! [Boolean] default = True + ! If true, use buggy logic that gives the wrong bounds for the next iteration + ! when successive guesses increase by exactly EPBL_MLD_TOLERANCE. EPBL_MLD_MAX_ITS = 40 ! default = 20 ! The maximum number of iterations that can be used to find a self-consistent - ! mixed layer depth. If EPBL_MLD_BISECTION is true, the maximum number - ! iteractions needed is set by Depth/2^MAX_ITS < EPBL_MLD_TOLERANCE. + ! mixed layer depth. If EPBL_MLD_BISECTION is true, the maximum number of + ! iterations needed is set by Depth/2^MAX_ITS < EPBL_MLD_TOLERANCE. EPBL_MIN_MIX_LEN = 0.0 ! [meter] default = 0.0 ! The minimum mixing length scale that will be used by ePBL. The default (0) ! does not set a minimum. @@ -2063,6 +2071,9 @@ EPBL_VEL_SCALE_FACTOR = 0.5477 ! [nondim] default = 1.0 ! the PBL diffusivity. VSTAR_SURF_FAC = 1.8258 ! [nondim] default = 1.2 ! The proportionality times ustar to set vstar at the surface. +EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a + ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. USE_LA_LI2016 = True ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. @@ -2072,12 +2083,12 @@ EPBL_LANGMUIR_SCHEME = "ADDITIVE" ! default = "NONE" ! NONE - Do not do any extra mixing due to Langmuir turbulence ! RESCALE - Use a multiplicative rescaling of mstar to account for Langmuir ! turbulence - ! ADDITIVE - Add a Langmuir turblence contribution to mstar to other + ! ADDITIVE - Add a Langmuir turbulence contribution to mstar to other ! contributions LT_ENHANCE_COEF = 0.1056 ! [nondim] default = 0.447 ! Coefficient for Langmuir enhancement of mstar LT_ENHANCE_EXP = -1.0 ! [nondim] default = -1.33 - ! Exponent for Langmuir enhancementt of mstar + ! Exponent for Langmuir enhancement of mstar LT_MOD_LAC1 = 0.0 ! [nondim] default = -0.87 ! Coefficient for modification of Langmuir number due to MLD approaching Ekman ! depth. @@ -2093,6 +2104,10 @@ LT_MOD_LAC4 = 0.8 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.8 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ratio of Ekman to ! unstable Obukhov depth. +EPBL_OPTIONS_DIFF = 0 ! default = 0 + ! If positive, this is a coded integer indicating a pair of settings whose + ! differences are diagnosed in a passive diagnostic mode via extra calls to + ! ePBL_column. If this is 0 or negative no extra calls occur. !EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ePBL code, derived from ! OMEGA and ANGSTROM. diff --git a/exps/NWA12.COBALT/MOM_parameter_doc.layout b/exps/NWA12.COBALT/MOM_parameter_doc.layout index 7edeab8e1..401aade9b 100644 --- a/exps/NWA12.COBALT/MOM_parameter_doc.layout +++ b/exps/NWA12.COBALT/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 25 ! ! in MOM_memory.h at compile time. LAYOUT = 25, 25 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/exps/NWA12.COBALT/MOM_parameter_doc.short b/exps/NWA12.COBALT/MOM_parameter_doc.short index ecc280683..23adab7d6 100644 --- a/exps/NWA12.COBALT/MOM_parameter_doc.short +++ b/exps/NWA12.COBALT/MOM_parameter_doc.short @@ -163,7 +163,7 @@ OBC_TIDE_ADD_NODAL = True ! [Boolean] default = False ! If true, include 18.6 year nodal modulation in the boundary tidal forcing. OBC_TIDE_REF_DATE = 1993, 1, 1 ! ! Reference date to use for tidal calculations and equilibrium phase. -OBC_TIDE_NODAL_REF_DATE = 1993, 7, 2 ! default = 0 +OBC_TIDE_NODAL_REF_DATE = 1993, 7, 2 ! default = 0, 0, 0 ! Fixed reference date to use for nodal modulation of boundary tides. ! === module MOM_verticalGrid === @@ -373,7 +373,7 @@ TIDE_MF = True ! [Boolean] default = False TIDE_MM = True ! [Boolean] default = False ! If true, apply tidal momentum forcing at the MM frequency. This is only used ! if TIDES is true. -TIDE_REF_DATE = 1993, 1, 1 ! default = 0 +TIDE_REF_DATE = 1993, 1, 1 ! default = 0, 0, 0 ! Year,month,day to use as reference date for tidal forcing. If not specified, ! defaults to 0. TIDE_USE_EQ_PHASE = True ! [Boolean] default = False @@ -601,8 +601,8 @@ EPBL_MLD_BISECTION = True ! [Boolean] default = False ! this. EPBL_MLD_MAX_ITS = 40 ! default = 20 ! The maximum number of iterations that can be used to find a self-consistent - ! mixed layer depth. If EPBL_MLD_BISECTION is true, the maximum number - ! iteractions needed is set by Depth/2^MAX_ITS < EPBL_MLD_TOLERANCE. + ! mixed layer depth. If EPBL_MLD_BISECTION is true, the maximum number of + ! iterations needed is set by Depth/2^MAX_ITS < EPBL_MLD_TOLERANCE. MIX_LEN_EXPONENT = 1.0 ! [nondim] default = 2.0 ! The exponent applied to the ratio of the distance to the MLD and the MLD depth ! which determines the shape of the mixing length. This is only used if @@ -631,12 +631,12 @@ EPBL_LANGMUIR_SCHEME = "ADDITIVE" ! default = "NONE" ! NONE - Do not do any extra mixing due to Langmuir turbulence ! RESCALE - Use a multiplicative rescaling of mstar to account for Langmuir ! turbulence - ! ADDITIVE - Add a Langmuir turblence contribution to mstar to other + ! ADDITIVE - Add a Langmuir turbulence contribution to mstar to other ! contributions LT_ENHANCE_COEF = 0.1056 ! [nondim] default = 0.447 ! Coefficient for Langmuir enhancement of mstar LT_ENHANCE_EXP = -1.0 ! [nondim] default = -1.33 - ! Exponent for Langmuir enhancementt of mstar + ! Exponent for Langmuir enhancement of mstar LT_MOD_LAC1 = 0.0 ! [nondim] default = -0.87 ! Coefficient for modification of Langmuir number due to MLD approaching Ekman ! depth. diff --git a/exps/NWA12.COBALT/SIS_parameter_doc.layout b/exps/NWA12.COBALT/SIS_parameter_doc.layout index 970cb7525..31fd08682 100644 --- a/exps/NWA12.COBALT/SIS_parameter_doc.layout +++ b/exps/NWA12.COBALT/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 25 ! ! in SIS2_memory.h at compile time. LAYOUT = 25, 25 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/exps/NWA12.tidesonly/MOM_parameter_doc.all b/exps/NWA12.tidesonly/MOM_parameter_doc.all index f951f5684..35cedfcb3 100644 --- a/exps/NWA12.tidesonly/MOM_parameter_doc.all +++ b/exps/NWA12.tidesonly/MOM_parameter_doc.all @@ -343,7 +343,7 @@ OBC_TIDE_ADD_NODAL = False ! [Boolean] default = False ! If true, include 18.6 year nodal modulation in the boundary tidal forcing. OBC_TIDE_REF_DATE = 1993, 1, 1 ! ! Reference date to use for tidal calculations and equilibrium phase. -OBC_TIDE_NODAL_REF_DATE = 0, 0, 0 ! default = 0 +OBC_TIDE_NODAL_REF_DATE = 0, 0, 0 ! default = 0, 0, 0 ! Fixed reference date to use for nodal modulation of boundary tides. TIDE_M2_FREQ = 1.405189E-04 ! [rad s-1] default = 1.405189E-04 ! Frequency of the M2 tidal constituent. This is only used if TIDES and TIDE_M2 @@ -1051,7 +1051,7 @@ TIDAL_SAL_FROM_FILE = False ! [Boolean] default = False USE_PREVIOUS_TIDES = False ! [Boolean] default = False ! If true, use the SAL from the previous iteration of the tides to facilitate ! convergent iteration. This is only used if TIDES is true. -TIDE_REF_DATE = 0, 0, 0 ! default = 0 +TIDE_REF_DATE = 0, 0, 0 ! default = 0, 0, 0 ! Year,month,day to use as reference date for tidal forcing. If not specified, ! defaults to 0. TIDE_USE_EQ_PHASE = False ! [Boolean] default = False @@ -1559,8 +1559,7 @@ BUOY_CONFIG = "zero" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/exps/NWA12.tidesonly/MOM_parameter_doc.layout b/exps/NWA12.tidesonly/MOM_parameter_doc.layout index b7e94719d..6ea7c5e31 100644 --- a/exps/NWA12.tidesonly/MOM_parameter_doc.layout +++ b/exps/NWA12.tidesonly/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 2 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 2 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/exps/OM4.single_column.COBALT/MOM_parameter_doc.all b/exps/OM4.single_column.COBALT/MOM_parameter_doc.all index 5180ccaa2..82c87625e 100644 --- a/exps/OM4.single_column.COBALT/MOM_parameter_doc.all +++ b/exps/OM4.single_column.COBALT/MOM_parameter_doc.all @@ -1630,6 +1630,11 @@ MKE_TO_TKE_EFFIC = 0.0 ! [nondim] default = 0.0 TKE_DECAY = 0.01 ! [nondim] default = 2.5 ! TKE_DECAY relates the vertical rate of decay of the TKE available for ! mechanical entrainment to the natural Ekman depth. +DIRECT_EPBL_MIXING_CALC = False ! [Boolean] default = False + ! If true and there is no conversion from mean kinetic energy to ePBL turbulent + ! kinetic energy, use a direct calculation of the diffusivity that is supported + ! by a given energy input instead of the more general but slower iterative + ! solver. EPBL_MSTAR_SCHEME = "CONSTANT" ! default = "CONSTANT" ! EPBL_MSTAR_SCHEME selects the method for setting mstar. Valid values are: ! CONSTANT - Use a fixed mstar given by MSTAR @@ -1663,10 +1668,13 @@ EPBL_MLD_BISECTION = False ! [Boolean] default = False ! mixed layer depth. Otherwise use the false position after a maximum and ! minimum bound have been evaluated and the returned value or bisection before ! this. +EPBL_MLD_ITER_BUG = True ! [Boolean] default = True + ! If true, use buggy logic that gives the wrong bounds for the next iteration + ! when successive guesses increase by exactly EPBL_MLD_TOLERANCE. EPBL_MLD_MAX_ITS = 20 ! default = 20 ! The maximum number of iterations that can be used to find a self-consistent - ! mixed layer depth. If EPBL_MLD_BISECTION is true, the maximum number - ! iteractions needed is set by Depth/2^MAX_ITS < EPBL_MLD_TOLERANCE. + ! mixed layer depth. If EPBL_MLD_BISECTION is true, the maximum number of + ! iterations needed is set by Depth/2^MAX_ITS < EPBL_MLD_TOLERANCE. EPBL_MIN_MIX_LEN = 0.0 ! [meter] default = 0.0 ! The minimum mixing length scale that will be used by ePBL. The default (0) ! does not set a minimum. @@ -1689,6 +1697,9 @@ EPBL_VEL_SCALE_FACTOR = 1.0 ! [nondim] default = 1.0 ! the PBL diffusivity. VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 ! The proportionality times ustar to set vstar at the surface. +EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a + ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. USE_LA_LI2016 = True ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. @@ -1698,12 +1709,12 @@ EPBL_LANGMUIR_SCHEME = "ADDITIVE" ! default = "NONE" ! NONE - Do not do any extra mixing due to Langmuir turbulence ! RESCALE - Use a multiplicative rescaling of mstar to account for Langmuir ! turbulence - ! ADDITIVE - Add a Langmuir turblence contribution to mstar to other + ! ADDITIVE - Add a Langmuir turbulence contribution to mstar to other ! contributions LT_ENHANCE_COEF = 0.044 ! [nondim] default = 0.447 ! Coefficient for Langmuir enhancement of mstar LT_ENHANCE_EXP = -1.5 ! [nondim] default = -1.33 - ! Exponent for Langmuir enhancementt of mstar + ! Exponent for Langmuir enhancement of mstar LT_MOD_LAC1 = 0.0 ! [nondim] default = -0.87 ! Coefficient for modification of Langmuir number due to MLD approaching Ekman ! depth. @@ -1719,6 +1730,10 @@ LT_MOD_LAC4 = 0.0 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.22 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ratio of Ekman to ! unstable Obukhov depth. +EPBL_OPTIONS_DIFF = 0 ! default = 0 + ! If positive, this is a coded integer indicating a pair of settings whose + ! differences are diagnosed in a passive diagnostic mode via extra calls to + ! ePBL_column. If this is 0 or negative no extra calls occur. !EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ePBL code, derived from ! OMEGA and ANGSTROM. diff --git a/exps/OM4.single_column.COBALT/MOM_parameter_doc.layout b/exps/OM4.single_column.COBALT/MOM_parameter_doc.layout index fda8b57a3..58effda3d 100644 --- a/exps/OM4.single_column.COBALT/MOM_parameter_doc.layout +++ b/exps/OM4.single_column.COBALT/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 0, 0 ! default = 1 +IO_LAYOUT = 0, 0 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/exps/OM4.single_column.COBALT/MOM_parameter_doc.short b/exps/OM4.single_column.COBALT/MOM_parameter_doc.short index dd934ddfb..034a2aec1 100644 --- a/exps/OM4.single_column.COBALT/MOM_parameter_doc.short +++ b/exps/OM4.single_column.COBALT/MOM_parameter_doc.short @@ -420,12 +420,12 @@ EPBL_LANGMUIR_SCHEME = "ADDITIVE" ! default = "NONE" ! NONE - Do not do any extra mixing due to Langmuir turbulence ! RESCALE - Use a multiplicative rescaling of mstar to account for Langmuir ! turbulence - ! ADDITIVE - Add a Langmuir turblence contribution to mstar to other + ! ADDITIVE - Add a Langmuir turbulence contribution to mstar to other ! contributions LT_ENHANCE_COEF = 0.044 ! [nondim] default = 0.447 ! Coefficient for Langmuir enhancement of mstar LT_ENHANCE_EXP = -1.5 ! [nondim] default = -1.33 - ! Exponent for Langmuir enhancementt of mstar + ! Exponent for Langmuir enhancement of mstar LT_MOD_LAC1 = 0.0 ! [nondim] default = -0.87 ! Coefficient for modification of Langmuir number due to MLD approaching Ekman ! depth. diff --git a/exps/OM4.single_column.COBALT/SIS_parameter_doc.layout b/exps/OM4.single_column.COBALT/SIS_parameter_doc.layout index 54dbd4cc4..597c30866 100644 --- a/exps/OM4.single_column.COBALT/SIS_parameter_doc.layout +++ b/exps/OM4.single_column.COBALT/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in SIS2_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 0, 0 ! default = 1 +IO_LAYOUT = 0, 0 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/exps/OM4p25.COBALT/MOM_parameter_doc.all b/exps/OM4p25.COBALT/MOM_parameter_doc.all index 17cb59def..8513f297f 100644 --- a/exps/OM4p25.COBALT/MOM_parameter_doc.all +++ b/exps/OM4p25.COBALT/MOM_parameter_doc.all @@ -2148,6 +2148,11 @@ MKE_TO_TKE_EFFIC = 0.0 ! [nondim] default = 0.0 TKE_DECAY = 0.01 ! [nondim] default = 2.5 ! TKE_DECAY relates the vertical rate of decay of the TKE available for ! mechanical entrainment to the natural Ekman depth. +DIRECT_EPBL_MIXING_CALC = False ! [Boolean] default = False + ! If true and there is no conversion from mean kinetic energy to ePBL turbulent + ! kinetic energy, use a direct calculation of the diffusivity that is supported + ! by a given energy input instead of the more general but slower iterative + ! solver. EPBL_MSTAR_SCHEME = "OM4" ! default = "CONSTANT" ! EPBL_MSTAR_SCHEME selects the method for setting mstar. Valid values are: ! CONSTANT - Use a fixed mstar given by MSTAR @@ -2187,10 +2192,13 @@ EPBL_MLD_BISECTION = False ! [Boolean] default = False ! mixed layer depth. Otherwise use the false position after a maximum and ! minimum bound have been evaluated and the returned value or bisection before ! this. +EPBL_MLD_ITER_BUG = True ! [Boolean] default = True + ! If true, use buggy logic that gives the wrong bounds for the next iteration + ! when successive guesses increase by exactly EPBL_MLD_TOLERANCE. EPBL_MLD_MAX_ITS = 20 ! default = 20 ! The maximum number of iterations that can be used to find a self-consistent - ! mixed layer depth. If EPBL_MLD_BISECTION is true, the maximum number - ! iteractions needed is set by Depth/2^MAX_ITS < EPBL_MLD_TOLERANCE. + ! mixed layer depth. If EPBL_MLD_BISECTION is true, the maximum number of + ! iterations needed is set by Depth/2^MAX_ITS < EPBL_MLD_TOLERANCE. EPBL_MIN_MIX_LEN = 0.0 ! [meter] default = 0.0 ! The minimum mixing length scale that will be used by ePBL. The default (0) ! does not set a minimum. @@ -2213,6 +2221,9 @@ EPBL_VEL_SCALE_FACTOR = 1.0 ! [nondim] default = 1.0 ! the PBL diffusivity. VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2 ! The proportionality times ustar to set vstar at the surface. +EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0 + ! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a + ! value that is greater than 0 to enable bottom boundary layer mixing from EPBL. USE_LA_LI2016 = True ! [Boolean] default = False ! A logical to use the Li et al. 2016 (submitted) formula to determine the ! Langmuir number. @@ -2222,12 +2233,12 @@ EPBL_LANGMUIR_SCHEME = "ADDITIVE" ! default = "NONE" ! NONE - Do not do any extra mixing due to Langmuir turbulence ! RESCALE - Use a multiplicative rescaling of mstar to account for Langmuir ! turbulence - ! ADDITIVE - Add a Langmuir turblence contribution to mstar to other + ! ADDITIVE - Add a Langmuir turbulence contribution to mstar to other ! contributions LT_ENHANCE_COEF = 0.044 ! [nondim] default = 0.447 ! Coefficient for Langmuir enhancement of mstar LT_ENHANCE_EXP = -1.5 ! [nondim] default = -1.33 - ! Exponent for Langmuir enhancementt of mstar + ! Exponent for Langmuir enhancement of mstar LT_MOD_LAC1 = 0.0 ! [nondim] default = -0.87 ! Coefficient for modification of Langmuir number due to MLD approaching Ekman ! depth. @@ -2243,6 +2254,10 @@ LT_MOD_LAC4 = 0.0 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.22 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ratio of Ekman to ! unstable Obukhov depth. +EPBL_OPTIONS_DIFF = 0 ! default = 0 + ! If positive, this is a coded integer indicating a pair of settings whose + ! differences are diagnosed in a passive diagnostic mode via extra calls to + ! ePBL_column. If this is 0 or negative no extra calls occur. !EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ePBL code, derived from ! OMEGA and ANGSTROM. diff --git a/exps/OM4p25.COBALT/MOM_parameter_doc.layout b/exps/OM4p25.COBALT/MOM_parameter_doc.layout index 3dc668d9b..227734a5b 100644 --- a/exps/OM4p25.COBALT/MOM_parameter_doc.layout +++ b/exps/OM4p25.COBALT/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 30 ! ! in MOM_memory.h at compile time. LAYOUT = 30, 30 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/exps/OM4p25.COBALT/MOM_parameter_doc.short b/exps/OM4p25.COBALT/MOM_parameter_doc.short index faab86c2e..17b1df6b1 100644 --- a/exps/OM4p25.COBALT/MOM_parameter_doc.short +++ b/exps/OM4p25.COBALT/MOM_parameter_doc.short @@ -662,12 +662,12 @@ EPBL_LANGMUIR_SCHEME = "ADDITIVE" ! default = "NONE" ! NONE - Do not do any extra mixing due to Langmuir turbulence ! RESCALE - Use a multiplicative rescaling of mstar to account for Langmuir ! turbulence - ! ADDITIVE - Add a Langmuir turblence contribution to mstar to other + ! ADDITIVE - Add a Langmuir turbulence contribution to mstar to other ! contributions LT_ENHANCE_COEF = 0.044 ! [nondim] default = 0.447 ! Coefficient for Langmuir enhancement of mstar LT_ENHANCE_EXP = -1.5 ! [nondim] default = -1.33 - ! Exponent for Langmuir enhancementt of mstar + ! Exponent for Langmuir enhancement of mstar LT_MOD_LAC1 = 0.0 ! [nondim] default = -0.87 ! Coefficient for modification of Langmuir number due to MLD approaching Ekman ! depth. diff --git a/exps/OM4p25.COBALT/SIS_parameter_doc.layout b/exps/OM4p25.COBALT/SIS_parameter_doc.layout index bbd24aeb3..79266c048 100644 --- a/exps/OM4p25.COBALT/SIS_parameter_doc.layout +++ b/exps/OM4p25.COBALT/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 30 ! ! in SIS2_memory.h at compile time. LAYOUT = 30, 30 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/src/MOM6 b/src/MOM6 index d7a3929fe..7f63b80bd 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit d7a3929fe7e38f6c599dfe6c02e7e6c47eac4e88 +Subproject commit 7f63b80bd0d480dc8c6ebc71f4cb9a2653a65a78 diff --git a/src/ocean_BGC b/src/ocean_BGC index 135ecc138..154cd5995 160000 --- a/src/ocean_BGC +++ b/src/ocean_BGC @@ -1 +1 @@ -Subproject commit 135ecc138af87d79a5a748eb02f603ed29edfbb2 +Subproject commit 154cd599514fda31837d08143fb0680dbbcee18b