Skip to content

Commit

Permalink
MOM6: +(*)EPBL_BBL_EFFIC_BUG & DRAG_DIFFUSIVITY_ANSWER_DATE
Browse files Browse the repository at this point in the history
- NOAA-GFDL/MOM6@a645328be +(*)EPBL_BBL_EFFIC_BUG & DRAG_DIFFUSIVITY_ANSWER_DATE
- NOAA-GFDL/MOM6@4f53784df +Add EPBL_BBL_TIDAL_EFFIC
- NOAA-GFDL/MOM6@e856749b3 +Rename fluxes%TKE_tidal to fluxes%BBL_tidal_dis
- NOAA-GFDL/MOM6@fcdf8db44 +Rename visc%TKE_BBL to visc%BBL_meanKE_loss
- NOAA-GFDL/MOM6@93227b339 Rescale 7 ice shelf variables
- NOAA-GFDL/MOM6@2ade89713 Refactor spherical_harmonics_forward
- NOAA-GFDL/MOM6@320aac2fa Remove implicit copies in CT_extract_data rotation
- NOAA-GFDL/MOM6@094eb5487 Fix rotation in set_coupler_type_data
- NOAA-GFDL/MOM6@3be1543a2 Corrected many unit descriptions in comments
- NOAA-GFDL/MOM6@83c7119a2 Fix rescaling of internal tide of debugging code
- NOAA-GFDL/MOM6@576fb414b Diagnose area integrated fluxes in rescaled units
- NOAA-GFDL/MOM6@7a5adc77c +Refactor the spatial mean calculations
- NOAA-GFDL/MOM6@30df138d5 Fix dimensional rescaling in predict_MEKE
  • Loading branch information
mom6bot authored and Hallberg-NOAA committed Jan 25, 2025
1 parent d5ad4c5 commit fc8e4c7
Show file tree
Hide file tree
Showing 60 changed files with 288 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -1535,6 +1535,8 @@ SET_DIFF_ANSWER_DATE = 20181231 ! default = 20181231
! The vintage of the order of arithmetic and expressions in the set diffusivity
! calculations. Values below 20190101 recover the answers from the end of 2018,
! while higher values use updated and more robust forms of the same expressions.
! Values above 20250301 also use less confusing expressions to set the
! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.

! === module MOM_tidal_mixing ===
! Vertical Tidal Mixing Parameterization
Expand Down Expand Up @@ -1642,6 +1644,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False
! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL
! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL
! scheme.
DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101
! The vintage of the order of arithmetic in the drag diffusivity calculations.
! Values above 20250301 use less confusing expressions to set the bottom-drag
! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.
DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0
! A minimal distance over which to average to determine the average bottom
! boundary layer density.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1535,6 +1535,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the order of arithmetic and expressions in the set diffusivity
! calculations. Values below 20190101 recover the answers from the end of 2018,
! while higher values use updated and more robust forms of the same expressions.
! Values above 20250301 also use less confusing expressions to set the
! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.

! === module MOM_tidal_mixing ===
! Vertical Tidal Mixing Parameterization
Expand Down Expand Up @@ -1642,6 +1644,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False
! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL
! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL
! scheme.
DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101
! The vintage of the order of arithmetic in the drag diffusivity calculations.
! Values above 20250301 use less confusing expressions to set the bottom-drag
! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.
DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0
! A minimal distance over which to average to determine the average bottom
! boundary layer density.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1535,6 +1535,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the order of arithmetic and expressions in the set diffusivity
! calculations. Values below 20190101 recover the answers from the end of 2018,
! while higher values use updated and more robust forms of the same expressions.
! Values above 20250301 also use less confusing expressions to set the
! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.

! === module MOM_tidal_mixing ===
! Vertical Tidal Mixing Parameterization
Expand Down Expand Up @@ -1642,6 +1644,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False
! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL
! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL
! scheme.
DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101
! The vintage of the order of arithmetic in the drag diffusivity calculations.
! Values above 20250301 use less confusing expressions to set the bottom-drag
! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.
DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0
! A minimal distance over which to average to determine the average bottom
! boundary layer density.
Expand Down
6 changes: 6 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1535,6 +1535,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the order of arithmetic and expressions in the set diffusivity
! calculations. Values below 20190101 recover the answers from the end of 2018,
! while higher values use updated and more robust forms of the same expressions.
! Values above 20250301 also use less confusing expressions to set the
! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.

! === module MOM_tidal_mixing ===
! Vertical Tidal Mixing Parameterization
Expand Down Expand Up @@ -1642,6 +1644,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False
! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL
! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL
! scheme.
DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101
! The vintage of the order of arithmetic in the drag diffusivity calculations.
! Values above 20250301 use less confusing expressions to set the bottom-drag
! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.
DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0
! A minimal distance over which to average to determine the average bottom
! boundary layer density.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1835,6 +1835,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the order of arithmetic and expressions in the set diffusivity
! calculations. Values below 20190101 recover the answers from the end of 2018,
! while higher values use updated and more robust forms of the same expressions.
! Values above 20250301 also use less confusing expressions to set the
! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.

! === module MOM_tidal_mixing ===
! Vertical Tidal Mixing Parameterization
Expand Down Expand Up @@ -2203,6 +2205,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2
EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0
! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a
! value that is greater than 0 to enable bottom boundary layer mixing from EPBL.
EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0
! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom
! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis.
USE_LA_LI2016 = False ! [Boolean] default = False
! A logical to use the Li et al. 2016 (submitted) formula to determine the
! Langmuir number.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1829,6 +1829,8 @@ SET_DIFF_ANSWER_DATE = 20181231 ! default = 20181231
! The vintage of the order of arithmetic and expressions in the set diffusivity
! calculations. Values below 20190101 recover the answers from the end of 2018,
! while higher values use updated and more robust forms of the same expressions.
! Values above 20250301 also use less confusing expressions to set the
! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.

! === module MOM_tidal_mixing ===
! Vertical Tidal Mixing Parameterization
Expand Down Expand Up @@ -2241,6 +2243,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2
EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0
! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a
! value that is greater than 0 to enable bottom boundary layer mixing from EPBL.
EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0
! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom
! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis.
USE_LA_LI2016 = True ! [Boolean] default = False
! A logical to use the Li et al. 2016 (submitted) formula to determine the
! Langmuir number.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1848,6 +1848,8 @@ SET_DIFF_ANSWER_DATE = 20181231 ! default = 20181231
! The vintage of the order of arithmetic and expressions in the set diffusivity
! calculations. Values below 20190101 recover the answers from the end of 2018,
! while higher values use updated and more robust forms of the same expressions.
! Values above 20250301 also use less confusing expressions to set the
! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.

! === module MOM_tidal_mixing ===
! Vertical Tidal Mixing Parameterization
Expand Down Expand Up @@ -2260,6 +2262,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2
EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0
! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a
! value that is greater than 0 to enable bottom boundary layer mixing from EPBL.
EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0
! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom
! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis.
USE_LA_LI2016 = True ! [Boolean] default = False
! A logical to use the Li et al. 2016 (submitted) formula to determine the
! Langmuir number.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1829,6 +1829,8 @@ SET_DIFF_ANSWER_DATE = 20181231 ! default = 20181231
! The vintage of the order of arithmetic and expressions in the set diffusivity
! calculations. Values below 20190101 recover the answers from the end of 2018,
! while higher values use updated and more robust forms of the same expressions.
! Values above 20250301 also use less confusing expressions to set the
! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.

! === module MOM_tidal_mixing ===
! Vertical Tidal Mixing Parameterization
Expand Down Expand Up @@ -2241,6 +2243,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2
EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0
! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a
! value that is greater than 0 to enable bottom boundary layer mixing from EPBL.
EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0
! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom
! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis.
USE_LA_LI2016 = True ! [Boolean] default = False
! A logical to use the Li et al. 2016 (submitted) formula to determine the
! Langmuir number.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1848,6 +1848,8 @@ SET_DIFF_ANSWER_DATE = 20181231 ! default = 20181231
! The vintage of the order of arithmetic and expressions in the set diffusivity
! calculations. Values below 20190101 recover the answers from the end of 2018,
! while higher values use updated and more robust forms of the same expressions.
! Values above 20250301 also use less confusing expressions to set the
! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.

! === module MOM_tidal_mixing ===
! Vertical Tidal Mixing Parameterization
Expand Down Expand Up @@ -2260,6 +2262,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2
EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0
! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a
! value that is greater than 0 to enable bottom boundary layer mixing from EPBL.
EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0
! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom
! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis.
USE_LA_LI2016 = True ! [Boolean] default = False
! A logical to use the Li et al. 2016 (submitted) formula to determine the
! Langmuir number.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1807,6 +1807,8 @@ SET_DIFF_ANSWER_DATE = 20181231 ! default = 20181231
! The vintage of the order of arithmetic and expressions in the set diffusivity
! calculations. Values below 20190101 recover the answers from the end of 2018,
! while higher values use updated and more robust forms of the same expressions.
! Values above 20250301 also use less confusing expressions to set the
! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.

! === module MOM_tidal_mixing ===
! Vertical Tidal Mixing Parameterization
Expand Down Expand Up @@ -2200,6 +2202,9 @@ VSTAR_SURF_FAC = 1.2 ! [nondim] default = 1.2
EPBL_BBL_EFFIC = 0.0 ! [nondim] default = 0.0
! The efficiency of bottom boundary layer mixing via ePBL. Setting this to a
! value that is greater than 0 to enable bottom boundary layer mixing from EPBL.
EPBL_BBL_TIDAL_EFFIC = 0.0 ! [nondim] default = 0.0
! The efficiency of bottom boundary layer mixing via ePBL driven by the bottom
! drag dissipation of tides, as provided in fluxes%BBL_tidal_dis.
USE_LA_LI2016 = True ! [Boolean] default = False
! A logical to use the Li et al. 2016 (submitted) formula to determine the
! Langmuir number.
Expand Down
6 changes: 6 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1502,6 +1502,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the order of arithmetic and expressions in the set diffusivity
! calculations. Values below 20190101 recover the answers from the end of 2018,
! while higher values use updated and more robust forms of the same expressions.
! Values above 20250301 also use less confusing expressions to set the
! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.

! === module MOM_tidal_mixing ===
! Vertical Tidal Mixing Parameterization
Expand Down Expand Up @@ -1609,6 +1611,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False
! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL
! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL
! scheme.
DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101
! The vintage of the order of arithmetic in the drag diffusivity calculations.
! Values above 20250301 use less confusing expressions to set the bottom-drag
! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.
DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0
! A minimal distance over which to average to determine the average bottom
! boundary layer density.
Expand Down
6 changes: 6 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1502,6 +1502,8 @@ SET_DIFF_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the order of arithmetic and expressions in the set diffusivity
! calculations. Values below 20190101 recover the answers from the end of 2018,
! while higher values use updated and more robust forms of the same expressions.
! Values above 20250301 also use less confusing expressions to set the
! bottom-drag generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.

! === module MOM_tidal_mixing ===
! Vertical Tidal Mixing Parameterization
Expand Down Expand Up @@ -1609,6 +1611,10 @@ USE_LOTW_BBL_DIFFUSIVITY = False ! [Boolean] default = False
! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL
! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL
! scheme.
DRAG_DIFFUSIVITY_ANSWER_DATE = 20250101 ! default = 20250101
! The vintage of the order of arithmetic in the drag diffusivity calculations.
! Values above 20250301 use less confusing expressions to set the bottom-drag
! generated diffusivity when USE_LOTW_BBL_DIFFUSIVITY is false.
DZ_BBL_AVG_MIN = 0.0 ! [m] default = 0.0
! A minimal distance over which to average to determine the average bottom
! boundary layer density.
Expand Down
Loading

0 comments on commit fc8e4c7

Please sign in to comment.