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 545e8fe6e..947168b95 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 @@ -1035,6 +1035,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at 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 adc89384a..d87f29641 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 @@ -1166,6 +1166,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at 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 c2deac5d7..8a568c144 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 @@ -1163,6 +1163,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at 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 74c84b7a9..cf2f263f7 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 @@ -1035,6 +1035,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at 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 1420c10c8..44d4012dc 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 @@ -1166,6 +1166,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at 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 fdae2b564..56db14508 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 @@ -1163,6 +1163,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at 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 f4667a693..3c77a8c85 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 @@ -1035,6 +1035,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at 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 83e60daaa..d1b96146d 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 @@ -1166,6 +1166,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at 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 679df5889..4ae84d07f 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 @@ -1163,6 +1163,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at 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 dd38938f8..d264c7129 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 @@ -1035,6 +1035,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at 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 ba12555c7..94c53d991 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 @@ -1166,6 +1166,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at 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 bdb06452e..eb8194e8d 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 @@ -1163,6 +1163,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 80c796b34..bffb300c1 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -1163,6 +1163,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 758684074..f87556fb0 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1804,6 +1804,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index ba029b705..a24832db3 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1642,6 +1642,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index 73d1f7f50..3b4ca55c3 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -1928,6 +1928,16 @@ ! long_name: Mixed layer depth (used defined) ! units: m ! cell_methods: xh:mean yh:mean area:mean +"MLD_003_refZ" [Unused] + ! modules: {ocean_model,ocean_model_d2} + ! long_name: Depth of reference density for MLD (delta rho = 0.03) + ! units: m + ! cell_methods: xh:mean yh:mean area:mean +"MLD_003_refRho" [Unused] + ! modules: {ocean_model,ocean_model_d2} + ! long_name: Reference density for MLD (delta rho = 0.03) + ! units: kg/m3 + ! cell_methods: xh:mean yh:mean area:mean "u_predia" [Unused] ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2} ! long_name: Zonal velocity before diabatic forcing diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 3660d4949..e1d1e59c5 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1751,6 +1751,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 2af0d0203..c8e827a4d 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -1910,6 +1910,16 @@ ! long_name: Mixed layer depth (used defined) ! units: m ! cell_methods: xh:mean yh:mean area:mean +"MLD_003_refZ" [Unused] + ! modules: {ocean_model,ocean_model_d2} + ! long_name: Depth of reference density for MLD (delta rho = 0.03) + ! units: m + ! cell_methods: xh:mean yh:mean area:mean +"MLD_003_refRho" [Unused] + ! modules: {ocean_model,ocean_model_d2} + ! long_name: Reference density for MLD (delta rho = 0.03) + ! units: kg/m3 + ! cell_methods: xh:mean yh:mean area:mean "u_predia" [Unused] ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2} ! long_name: Zonal velocity before diabatic forcing diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 58fd2aa3b..12ce3b976 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -1148,6 +1148,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index 7de742f20..d618b611e 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -1145,6 +1145,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 3*0.0 ! [J/m2] default = 0.0 ! 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 + ! Reference depth used to calculate the potential density used to find the mixed + ! layer depth based on a delta rho = 0.03 kg/m3. DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The density difference used to determine a diagnostic mixed layer depth, ! MLD_user, following the definition of Levitus 1982. The MLD is the depth at diff --git a/src/MOM6 b/src/MOM6 index fee3281c2..f1ba82263 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit fee3281c28443d3ced30814df217c8066df5a297 +Subproject commit f1ba822636bb937be1828a3e4f1e0e2155ea8b6a