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 d94e853d8..8b28a002a 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 @@ -1479,7 +1479,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 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 61ef19d94..aa504ff75 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 @@ -1479,7 +1479,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 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 eeb17e3a9..ce8f0590b 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 @@ -1479,7 +1479,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 55ff25a81..51b2b82d2 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1479,7 +1479,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 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 abd4fa759..0d37b3125 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 @@ -1774,7 +1774,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 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 598f85d2c..a7cc98a06 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -1786,7 +1786,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 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 c08c77618..b7cba9d59 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -1805,7 +1805,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 69ba14660..a8e3fc53e 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1786,7 +1786,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 8f80654eb..bf18883cb 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1805,7 +1805,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index 869de9933..4c6ea9faf 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -1776,7 +1776,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 99e15ebfb..9fe0e10c4 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -515,6 +515,7 @@ THICKNESS_CONFIG = "file" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1445,7 +1446,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short index 14dd8ad04..eacc03967 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short @@ -166,6 +166,7 @@ THICKNESS_CONFIG = "file" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 b41c5fa54..6759965fa 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -515,6 +515,7 @@ THICKNESS_CONFIG = "file" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1445,7 +1446,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 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 7d654105b..873765013 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short @@ -166,6 +166,7 @@ THICKNESS_CONFIG = "file" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index dc6df1c78..a1d108790 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -515,6 +515,7 @@ THICKNESS_CONFIG = "file" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1445,7 +1446,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short index 8a1cf0354..98a456468 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short @@ -166,6 +166,7 @@ THICKNESS_CONFIG = "file" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 935b4e94c..1454aa11a 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 @@ -425,6 +425,7 @@ THICKNESS_CONFIG = "uniform" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1042,7 +1043,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 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 1369606a5..140ff152b 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 @@ -545,6 +545,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1173,7 +1174,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 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 a4ed5a704..f6a929d79 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 @@ -149,6 +149,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 a39b95ed6..c1664b059 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 @@ -545,6 +545,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1170,7 +1171,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 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 4e5a0ffcd..9e1b5b331 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 @@ -149,6 +149,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 7ba92516c..637df2c58 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 @@ -425,6 +425,7 @@ THICKNESS_CONFIG = "uniform" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1042,7 +1043,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 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 6ac0f4cf4..54e3b3714 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 @@ -545,6 +545,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1173,7 +1174,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 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 32e583a48..cbe718d47 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 @@ -149,6 +149,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 e91a87096..89e47a748 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 @@ -545,6 +545,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1170,7 +1171,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 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 1a399f3eb..67103aadc 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 @@ -149,6 +149,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 1c45d661e..5bedf4425 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 @@ -425,6 +425,7 @@ THICKNESS_CONFIG = "uniform" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1042,7 +1043,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 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 df4bf497d..09daea5a3 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 @@ -545,6 +545,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1173,7 +1174,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 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 13a9e8a34..e3290468f 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 @@ -149,6 +149,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 1adc78950..b5f2bc483 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 @@ -545,6 +545,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1170,7 +1171,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 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 221817725..cadd63666 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 @@ -149,6 +149,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 94a51e469..3352e4940 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 @@ -425,6 +425,7 @@ THICKNESS_CONFIG = "uniform" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1042,7 +1043,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 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 fc1b9a59e..f267c09d0 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 @@ -545,6 +545,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1173,7 +1174,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 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 1396f1094..3da95283e 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 @@ -149,6 +149,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 4bceb3692..0f471bab7 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 @@ -545,6 +545,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1170,7 +1171,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 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 243c9cbe5..1efcb4cb8 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 @@ -149,6 +149,7 @@ THICKNESS_CONFIG = "coord" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 3de2a31bc..3920a4d69 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -495,6 +495,7 @@ THICKNESS_CONFIG = "DOME" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/DOME/MOM_parameter_doc.short b/ocean_only/DOME/MOM_parameter_doc.short index a580023f1..f010d4a77 100644 --- a/ocean_only/DOME/MOM_parameter_doc.short +++ b/ocean_only/DOME/MOM_parameter_doc.short @@ -173,6 +173,7 @@ THICKNESS_CONFIG = "DOME" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index 3e265d3cd..396886a91 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -388,6 +388,7 @@ THICKNESS_CONFIG = "phillips" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.short b/ocean_only/Phillips_2layer/MOM_parameter_doc.short index 67b22a45b..42a6e5a71 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.short +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.short @@ -148,6 +148,7 @@ THICKNESS_CONFIG = "phillips" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 31003cc7a..a9b9e5e99 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -545,6 +545,7 @@ THICKNESS_CONFIG = "uniform" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1170,7 +1171,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index cf45327d5..ade26f83b 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -441,6 +441,7 @@ THICKNESS_CONFIG = "adjustment2d" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1253,7 +1254,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short index ab882552a..e868ea8e5 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short @@ -163,6 +163,7 @@ THICKNESS_CONFIG = "adjustment2d" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index b7dcf2bef..b978b2d5d 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -608,6 +608,7 @@ THICKNESS_CONFIG = "adjustment2d" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1420,7 +1421,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short index e2ec8a53b..da79e51ae 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short @@ -213,6 +213,7 @@ THICKNESS_CONFIG = "adjustment2d" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 6d57951ac..16507e633 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -560,6 +560,7 @@ THICKNESS_CONFIG = "adjustment2d" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1372,7 +1373,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.short b/ocean_only/adjustment2d/z/MOM_parameter_doc.short index b7bc9dc95..53d991d4c 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.short @@ -191,6 +191,7 @@ THICKNESS_CONFIG = "adjustment2d" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 9ac8ebe66..b51c8677e 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -485,6 +485,7 @@ THICKNESS_CONFIG = "benchmark" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1355,7 +1356,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/benchmark/MOM_parameter_doc.short b/ocean_only/benchmark/MOM_parameter_doc.short index 4c5db5650..fb56d4b98 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.short +++ b/ocean_only/benchmark/MOM_parameter_doc.short @@ -157,6 +157,7 @@ THICKNESS_CONFIG = "benchmark" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 122300ef9..cac61ea18 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -501,6 +501,7 @@ THICKNESS_CONFIG = "circle_obcs" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.short b/ocean_only/circle_obcs/MOM_parameter_doc.short index 6f7e669cc..836c5c495 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.short +++ b/ocean_only/circle_obcs/MOM_parameter_doc.short @@ -164,6 +164,7 @@ THICKNESS_CONFIG = "circle_obcs" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 3481b69e5..20d8eafc4 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -378,6 +378,7 @@ THICKNESS_CONFIG = "uniform" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 12f9fc88e..2e49ccb3d 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -441,6 +441,7 @@ THICKNESS_CONFIG = "external_gwave" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1239,7 +1240,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/external_gwave/MOM_parameter_doc.short b/ocean_only/external_gwave/MOM_parameter_doc.short index 7fec004f9..6cb5021d7 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.short +++ b/ocean_only/external_gwave/MOM_parameter_doc.short @@ -160,6 +160,7 @@ THICKNESS_CONFIG = "external_gwave" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index c340bbf4c..2d760530b 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -452,6 +452,7 @@ THICKNESS_CONFIG = "DOME2D" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1250,7 +1251,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short index 469ae147d..f5287c157 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short @@ -160,6 +160,7 @@ THICKNESS_CONFIG = "DOME2D" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index 18393e2a5..c6ae6182f 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -619,6 +619,7 @@ THICKNESS_CONFIG = "DOME2D" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1419,7 +1420,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short index 4f3ee56c1..93d0f58e9 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short @@ -210,6 +210,7 @@ THICKNESS_CONFIG = "DOME2D" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index ee367fb70..54cb05e30 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -571,6 +571,7 @@ THICKNESS_CONFIG = "DOME2D" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1371,7 +1372,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short index 154a763fe..464f255e9 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short @@ -186,6 +186,7 @@ THICKNESS_CONFIG = "DOME2D" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 48333ac12..94eb15ff1 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -571,6 +571,7 @@ THICKNESS_CONFIG = "DOME2D" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1371,7 +1372,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.short b/ocean_only/flow_downslope/z/MOM_parameter_doc.short index c093b2d25..b441a302a 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.short @@ -186,6 +186,7 @@ THICKNESS_CONFIG = "DOME2D" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index e0097e456..180051f2a 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1824,7 +1824,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 8a95b0203..e4da31d5d 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1662,7 +1662,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 0c81c2630..f189dd8a0 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1771,7 +1771,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index d4160c71c..45bb563b9 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -441,6 +441,7 @@ THICKNESS_CONFIG = "lock_exchange" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1242,7 +1243,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.short b/ocean_only/lock_exchange/MOM_parameter_doc.short index eec2ff6c4..4f28de8fe 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.short +++ b/ocean_only/lock_exchange/MOM_parameter_doc.short @@ -155,6 +155,7 @@ THICKNESS_CONFIG = "lock_exchange" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 07accc7c3..a29e372c0 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -560,6 +560,7 @@ THICKNESS_CONFIG = "rossby_front" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1409,7 +1410,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 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 368af6bf9..dc87d68ca 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short @@ -168,6 +168,7 @@ THICKNESS_CONFIG = "rossby_front" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index a71aba034..41650a596 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -476,6 +476,7 @@ THICKNESS_CONFIG = "file" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1477,7 +1478,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.short b/ocean_only/nonBous_global/MOM_parameter_doc.short index 663f257be..a59a57860 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.short +++ b/ocean_only/nonBous_global/MOM_parameter_doc.short @@ -165,6 +165,7 @@ THICKNESS_CONFIG = "file" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index 1a912a9a8..f83483349 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -441,6 +441,7 @@ THICKNESS_CONFIG = "uniform" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1235,7 +1236,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index ff435b1b9..1dc7291c0 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -560,6 +560,7 @@ THICKNESS_CONFIG = "uniform" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1356,7 +1357,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index ba7a63fe4..a45913087 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -466,6 +466,7 @@ THICKNESS_CONFIG = "seamount" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1268,7 +1269,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.short b/ocean_only/seamount/layer/MOM_parameter_doc.short index 6072edd38..302ac5119 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.short +++ b/ocean_only/seamount/layer/MOM_parameter_doc.short @@ -163,6 +163,7 @@ THICKNESS_CONFIG = "seamount" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index aa0d6616e..5c7a0fde4 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -633,6 +633,7 @@ THICKNESS_CONFIG = "seamount" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1435,7 +1436,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.short b/ocean_only/seamount/rho/MOM_parameter_doc.short index 91503ecd7..5786b58ff 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.short +++ b/ocean_only/seamount/rho/MOM_parameter_doc.short @@ -213,6 +213,7 @@ THICKNESS_CONFIG = "seamount" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index e39fccd2a..72903b782 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -585,6 +585,7 @@ THICKNESS_CONFIG = "seamount" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1384,7 +1385,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.short b/ocean_only/seamount/sigma/MOM_parameter_doc.short index 571b20b00..a0da35154 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.short +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.short @@ -191,6 +191,7 @@ THICKNESS_CONFIG = "seamount" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index f2031181b..0af97d2bf 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -585,6 +585,7 @@ THICKNESS_CONFIG = "seamount" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1384,7 +1385,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/seamount/z/MOM_parameter_doc.short b/ocean_only/seamount/z/MOM_parameter_doc.short index df18061c7..ac01f3570 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.short +++ b/ocean_only/seamount/z/MOM_parameter_doc.short @@ -191,6 +191,7 @@ THICKNESS_CONFIG = "seamount" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index fb14bf6b5..f03ec0597 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -1073,7 +1073,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 38f6f5daa..1230c65ca 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -1155,7 +1155,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index e1376fbc2..a76f7b5c0 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -1152,7 +1152,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 8f2a6b64c..1a8cd371d 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -444,6 +444,7 @@ THICKNESS_CONFIG = "sloshing" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1251,7 +1252,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.short b/ocean_only/sloshing/layer/MOM_parameter_doc.short index a31dfa85a..530babf4d 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.short +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.short @@ -157,6 +157,7 @@ THICKNESS_CONFIG = "sloshing" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index a05f028dc..dd7c134e0 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -611,6 +611,7 @@ THICKNESS_CONFIG = "sloshing" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1420,7 +1421,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.short b/ocean_only/sloshing/rho/MOM_parameter_doc.short index c36e83481..a821a8159 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.short +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.short @@ -205,6 +205,7 @@ THICKNESS_CONFIG = "sloshing" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index b4443938a..7e9c7b968 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -563,6 +563,7 @@ THICKNESS_CONFIG = "sloshing" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1372,7 +1373,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.short b/ocean_only/sloshing/z/MOM_parameter_doc.short index 31a9207fc..c55a57d55 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.short +++ b/ocean_only/sloshing/z/MOM_parameter_doc.short @@ -183,6 +183,7 @@ THICKNESS_CONFIG = "sloshing" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index ec98c73e9..e8ee88e8f 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -463,6 +463,7 @@ THICKNESS_CONFIG = "uniform" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1234,7 +1235,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index c76ae79ea..76e758a9e 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -608,6 +608,7 @@ THICKNESS_CONFIG = "uniform" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1421,7 +1422,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index e45655e83..de26b3694 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -560,6 +560,7 @@ THICKNESS_CONFIG = "uniform" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1373,7 +1374,7 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 ! The largest fraction of a layer than can be lost to forcing (e.g. evaporation, ! sea-ice formation) in one time-step. The unused mass loss is passed down ! through the column. -MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 +MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index 63a565bf8..4eea1596f 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -366,6 +366,7 @@ THICKNESS_CONFIG = "uniform" ! default = "uniform" ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. ! list - read a list of positive interface depths. + ! param - use thicknesses from parameter THICKNESS_INIT_VALUES. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/src/MOM6 b/src/MOM6 index 2b72682f1..033714784 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 2b72682f10823d7264a92caedd6d3c770992bb37 +Subproject commit 033714784305ca8e09e5a746bafc63643e4eb0d0