Skip to content

Commit

Permalink
MOM6: Move MLD Diagnostics out of MOM_diabatic_aux.F90
Browse files Browse the repository at this point in the history
- NOAA-GFDL/MOM6@f1ba82263 Move MLD Diagnostics out of MOM_diabatic_aux.F90
- NOAA-GFDL/MOM6@906d96aa3 Add option to use non-surface density in MLD_003
- NOAA-GFDL/MOM6@e30a6e711 Fix bugs in setting GxSpV_u and GxSpV_v in MOM_isopycnal_slopes (#701)
  • Loading branch information
mom6bot authored and marshallward committed Aug 20, 2024
1 parent 433917f commit 8ef226f
Show file tree
Hide file tree
Showing 21 changed files with 75 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/global_ALE/hycom/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/global_ALE/layer/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions ocean_only/global_ALE/layer/available_diags.000000
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/global_ALE/z/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions ocean_only/global_ALE/z/available_diags.000000
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/single_column/EPBL/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/single_column/KPP/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8ef226f

Please sign in to comment.