Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg

ESMG · Aug 29, 2024 · b825f43 · b825f43
2 parents 8e9c4bb + 6f22300
commit b825f43
Show file tree

Hide file tree

Showing 26 changed files with 90 additions and 1 deletion.
diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.debugging b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_surface_forcing ===
 CHECK_NO_LAND_FLUXES = False    !   [Boolean] default = False

diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.debugging b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_surface_forcing ===
 CHECK_NO_LAND_FLUXES = False    !   [Boolean] default = False

diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.debugging b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_surface_forcing ===
 CHECK_NO_LAND_FLUXES = False    !   [Boolean] default = False

diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.debugging b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_surface_forcing ===
 CHECK_NO_LAND_FLUXES = False    !   [Boolean] default = False

diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.debugging b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_surface_forcing ===
 CHECK_NO_LAND_FLUXES = False    !   [Boolean] default = False

diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.debugging b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_surface_forcing ===
 CHECK_NO_LAND_FLUXES = False    !   [Boolean] default = False

diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.debugging b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_surface_forcing ===
 CHECK_NO_LAND_FLUXES = False    !   [Boolean] default = False

diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.debugging b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_surface_forcing ===
 CHECK_NO_LAND_FLUXES = False    !   [Boolean] default = False

diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.debugging b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_surface_forcing ===
 CHECK_NO_LAND_FLUXES = False    !   [Boolean] default = False

diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.debugging b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.debugging
@@ -72,6 +72,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_surface_forcing ===
 CHECK_NO_LAND_FLUXES = False    !   [Boolean] default = False

diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.debugging b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_surface_forcing ===
 CHECK_NO_LAND_FLUXES = False    !   [Boolean] default = False

diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.debugging b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_surface_forcing ===
 CHECK_NO_LAND_FLUXES = False    !   [Boolean] default = False

diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.debugging b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_surface_forcing ===
 CHECK_NO_LAND_FLUXES = False    !   [Boolean] default = False

diff --git a/ocean_only/benchmark/MOM_parameter_doc.debugging b/ocean_only/benchmark/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_file_parser ===
 REPORT_UNUSED_PARAMS = True     !   [Boolean] default = True

diff --git 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/hycom/MOM_parameter_doc.debugging b/ocean_only/global_ALE/hycom/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_file_parser ===
 REPORT_UNUSED_PARAMS = True     !   [Boolean] default = True

diff --git 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/MOM_parameter_doc.debugging b/ocean_only/global_ALE/layer/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_file_parser ===
 REPORT_UNUSED_PARAMS = True     !   [Boolean] default = True

diff --git 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
@@ -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/MOM_parameter_doc.debugging b/ocean_only/global_ALE/z/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_file_parser ===
 REPORT_UNUSED_PARAMS = True     !   [Boolean] default = True

diff --git 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/nonBous_global/MOM_parameter_doc.debugging b/ocean_only/nonBous_global/MOM_parameter_doc.debugging
@@ -80,6 +80,9 @@ DEBUG_CONSERVATION = False      !   [Boolean] default = False
 
 ! === module MOM_kappa_shear ===
 ! Parameterization of shear-driven turbulence following Jackson, Hallberg and Legg, JPO 2008
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_file_parser ===
 REPORT_UNUSED_PARAMS = True     !   [Boolean] default = True

diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.debugging b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.debugging
@@ -77,6 +77,9 @@ DEBUG_BT = False                !   [Boolean] default = False
 ! The following parameters are used for diabatic processes.
 DEBUG_CONSERVATION = False      !   [Boolean] default = False
                                 ! If true, monitor conservation and extrema.
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_file_parser ===
 REPORT_UNUSED_PARAMS = True     !   [Boolean] default = True

diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.debugging b/ocean_only/tracer_mixing/z/MOM_parameter_doc.debugging
@@ -77,6 +77,9 @@ DEBUG_BT = False                !   [Boolean] default = False
 ! The following parameters are used for diabatic processes.
 DEBUG_CONSERVATION = False      !   [Boolean] default = False
                                 ! If true, monitor conservation and extrema.
+WRITE_TRACER_MIN_MAX = False    !   [Boolean] default = False
+                                ! If true, write the maximum and minimum values of temperature, salinity and
+                                ! some tracer concentrations to stdout when the energy files are written.
 
 ! === module MOM_file_parser ===
 REPORT_UNUSED_PARAMS = True     !   [Boolean] default = True

diff --git a/src/MOM6 b/src/MOM6
+12 −12		src/core/MOM_isopycnal_slopes.F90
+487 −0		src/diagnostics/MOM_diagnose_MLD.F90
+191 −0		src/diagnostics/MOM_spatial_means.F90
+94 −14		src/diagnostics/MOM_sum_output.F90
+0 −392		src/parameterizations/vertical/MOM_diabatic_aux.F90
+18 −3		src/parameterizations/vertical/MOM_diabatic_driver.F90
+2 −188		src/tracer/MOM_generic_tracer.F90