Skip to content

Commit

Permalink
MOM6: EBT Backscatter (#706)
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@df2cd1265 EBT Backscatter (#706)
- NOAA-GFDL/MOM6@ba59078e7 Separate scalar diagnostics for each ice sheet + parameters to control ice-sheet velocities (#714)
- NOAA-GFDL/MOM6@b3d7348a9 Change the default of VISC_REM_CONT_HVEL_FIX
MOM6: Fortran 2018 testing
- NOAA-GFDL/MOM6@b67e93abc Reorder arguments in FMS_cap functions
MOM6: Fix argument orders and IO statements
- NOAA-GFDL/MOM6@1830b8e68 Dummy code to suppress errors in posix.F90
- NOAA-GFDL/MOM6@e4df84695 Merge remote-tracking branch 'MAIN/main' into feature/update-to-main-20240824
- NOAA-GFDL/MOM6@8d05f394d initialize cpl_scalar field when created
  • Loading branch information
@mom6bot @marshallward
mom6bot authored and marshallward committed Sep 30, 2024
1 parent 1bddc65 commit 642364e
Show file tree
Hide file tree
Showing 64 changed files with 501 additions and 1 deletion.
6 changes: 6 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,9 @@ RESOLN_SCALED_KHTR = False ! [Boolean] default = False
RESOLN_USE_EBT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic wave speed instead of first baroclinic
! wave for calculating the resolution fn.
BACKSCAT_EBT_POWER = 0.0 ! [nondim] default = 0.0
! Power to raise EBT vertical structure to when backscatter has vertical
! structure.
KHTH_USE_EBT_STRUCT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! thickness diffusivity.
Expand Down Expand Up @@ -1154,6 +1157,9 @@ BOUND_KH = True ! [Boolean] default = True
BETTER_BOUND_KH = True ! [Boolean] default = True
! If true, the Laplacian coefficient is locally limited to be stable with a
! better bounding than just BOUND_KH.
EY24_EBT_BS = False ! [Boolean] default = False
! If true, use the the backscatter scheme (EBT mode with kill switch)developed
! by Yankovsky et al. (2024).
ANISOTROPIC_VISCOSITY = False ! [Boolean] default = False
! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
ADD_LES_VISCOSITY = False ! [Boolean] default = False
Expand Down
6 changes: 6 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,9 @@ RESOLN_SCALED_KHTR = False ! [Boolean] default = False
RESOLN_USE_EBT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic wave speed instead of first baroclinic
! wave for calculating the resolution fn.
BACKSCAT_EBT_POWER = 0.0 ! [nondim] default = 0.0
! Power to raise EBT vertical structure to when backscatter has vertical
! structure.
KHTH_USE_EBT_STRUCT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! thickness diffusivity.
Expand Down Expand Up @@ -1154,6 +1157,9 @@ BOUND_KH = True ! [Boolean] default = True
BETTER_BOUND_KH = True ! [Boolean] default = True
! If true, the Laplacian coefficient is locally limited to be stable with a
! better bounding than just BOUND_KH.
EY24_EBT_BS = False ! [Boolean] default = False
! If true, use the the backscatter scheme (EBT mode with kill switch)developed
! by Yankovsky et al. (2024).
ANISOTROPIC_VISCOSITY = False ! [Boolean] default = False
! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
ADD_LES_VISCOSITY = False ! [Boolean] default = False
Expand Down
6 changes: 6 additions & 0 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,9 @@ RESOLN_SCALED_KHTR = False ! [Boolean] default = False
RESOLN_USE_EBT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic wave speed instead of first baroclinic
! wave for calculating the resolution fn.
BACKSCAT_EBT_POWER = 0.0 ! [nondim] default = 0.0
! Power to raise EBT vertical structure to when backscatter has vertical
! structure.
KHTH_USE_EBT_STRUCT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! thickness diffusivity.
Expand Down Expand Up @@ -1154,6 +1157,9 @@ BOUND_KH = True ! [Boolean] default = True
BETTER_BOUND_KH = True ! [Boolean] default = True
! If true, the Laplacian coefficient is locally limited to be stable with a
! better bounding than just BOUND_KH.
EY24_EBT_BS = False ! [Boolean] default = False
! If true, use the the backscatter scheme (EBT mode with kill switch)developed
! by Yankovsky et al. (2024).
ANISOTROPIC_VISCOSITY = False ! [Boolean] default = False
! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
ADD_LES_VISCOSITY = False ! [Boolean] default = False
Expand Down
6 changes: 6 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,9 @@ RESOLN_SCALED_KHTR = False ! [Boolean] default = False
RESOLN_USE_EBT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic wave speed instead of first baroclinic
! wave for calculating the resolution fn.
BACKSCAT_EBT_POWER = 0.0 ! [nondim] default = 0.0
! Power to raise EBT vertical structure to when backscatter has vertical
! structure.
KHTH_USE_EBT_STRUCT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! thickness diffusivity.
Expand Down Expand Up @@ -1154,6 +1157,9 @@ BOUND_KH = True ! [Boolean] default = True
BETTER_BOUND_KH = True ! [Boolean] default = True
! If true, the Laplacian coefficient is locally limited to be stable with a
! better bounding than just BOUND_KH.
EY24_EBT_BS = False ! [Boolean] default = False
! If true, use the the backscatter scheme (EBT mode with kill switch)developed
! by Yankovsky et al. (2024).
ANISOTROPIC_VISCOSITY = False ! [Boolean] default = False
! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
ADD_LES_VISCOSITY = False ! [Boolean] default = False
Expand Down
10 changes: 10 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,10 @@ MEKE_EQUILIBRIUM_RESTORING = False ! [Boolean] default = False
MEKE_FRCOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of mean energy into MEKE. If MEKE_FRCOEFF is
! negative, this conversion is not used or calculated.
MEKE_BHFRCOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of mean energy into MEKE by the biharmonic
! dissipation. If MEKE_bhFRCOEFF is negative, this conversion is not used or
! calculated.
MEKE_GMECOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of MEKE into mean energy by GME. If
! MEKE_GMECOEFF is negative, this conversion is not used or calculated.
Expand Down Expand Up @@ -889,6 +893,9 @@ RESOLN_SCALED_KHTR = False ! [Boolean] default = False
RESOLN_USE_EBT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic wave speed instead of first baroclinic
! wave for calculating the resolution fn.
BACKSCAT_EBT_POWER = 0.0 ! [nondim] default = 0.0
! Power to raise EBT vertical structure to when backscatter has vertical
! structure.
KHTH_USE_EBT_STRUCT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! thickness diffusivity.
Expand Down Expand Up @@ -1393,6 +1400,9 @@ BOUND_KH = True ! [Boolean] default = True
BETTER_BOUND_KH = True ! [Boolean] default = True
! If true, the Laplacian coefficient is locally limited to be stable with a
! better bounding than just BOUND_KH.
EY24_EBT_BS = False ! [Boolean] default = False
! If true, use the the backscatter scheme (EBT mode with kill switch)developed
! by Yankovsky et al. (2024).
ANISOTROPIC_VISCOSITY = False ! [Boolean] default = False
! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
ADD_LES_VISCOSITY = False ! [Boolean] default = False
Expand Down
10 changes: 10 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,10 @@ MEKE_EQUILIBRIUM_RESTORING = False ! [Boolean] default = False
MEKE_FRCOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of mean energy into MEKE. If MEKE_FRCOEFF is
! negative, this conversion is not used or calculated.
MEKE_BHFRCOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of mean energy into MEKE by the biharmonic
! dissipation. If MEKE_bhFRCOEFF is negative, this conversion is not used or
! calculated.
MEKE_GMECOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of MEKE into mean energy by GME. If
! MEKE_GMECOEFF is negative, this conversion is not used or calculated.
Expand Down Expand Up @@ -978,6 +982,9 @@ RESOLN_SCALED_KHTR = False ! [Boolean] default = False
RESOLN_USE_EBT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic wave speed instead of first baroclinic
! wave for calculating the resolution fn.
BACKSCAT_EBT_POWER = 0.0 ! [nondim] default = 0.0
! Power to raise EBT vertical structure to when backscatter has vertical
! structure.
KHTH_USE_EBT_STRUCT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! thickness diffusivity.
Expand Down Expand Up @@ -1402,6 +1409,9 @@ BOUND_KH = True ! [Boolean] default = True
BETTER_BOUND_KH = True ! [Boolean] default = True
! If true, the Laplacian coefficient is locally limited to be stable with a
! better bounding than just BOUND_KH.
EY24_EBT_BS = False ! [Boolean] default = False
! If true, use the the backscatter scheme (EBT mode with kill switch)developed
! by Yankovsky et al. (2024).
ANISOTROPIC_VISCOSITY = False ! [Boolean] default = False
! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
ADD_LES_VISCOSITY = False ! [Boolean] default = False
Expand Down
10 changes: 10 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,10 @@ MEKE_EQUILIBRIUM_RESTORING = False ! [Boolean] default = False
MEKE_FRCOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of mean energy into MEKE. If MEKE_FRCOEFF is
! negative, this conversion is not used or calculated.
MEKE_BHFRCOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of mean energy into MEKE by the biharmonic
! dissipation. If MEKE_bhFRCOEFF is negative, this conversion is not used or
! calculated.
MEKE_GMECOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of MEKE into mean energy by GME. If
! MEKE_GMECOEFF is negative, this conversion is not used or calculated.
Expand Down Expand Up @@ -978,6 +982,9 @@ RESOLN_SCALED_KHTR = False ! [Boolean] default = False
RESOLN_USE_EBT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic wave speed instead of first baroclinic
! wave for calculating the resolution fn.
BACKSCAT_EBT_POWER = 0.0 ! [nondim] default = 0.0
! Power to raise EBT vertical structure to when backscatter has vertical
! structure.
KHTH_USE_EBT_STRUCT = True ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! thickness diffusivity.
Expand Down Expand Up @@ -1421,6 +1428,9 @@ BOUND_KH = True ! [Boolean] default = True
BETTER_BOUND_KH = True ! [Boolean] default = True
! If true, the Laplacian coefficient is locally limited to be stable with a
! better bounding than just BOUND_KH.
EY24_EBT_BS = False ! [Boolean] default = False
! If true, use the the backscatter scheme (EBT mode with kill switch)developed
! by Yankovsky et al. (2024).
ANISOTROPIC_VISCOSITY = False ! [Boolean] default = False
! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
ADD_LES_VISCOSITY = False ! [Boolean] default = False
Expand Down
10 changes: 10 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,10 @@ MEKE_EQUILIBRIUM_RESTORING = False ! [Boolean] default = False
MEKE_FRCOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of mean energy into MEKE. If MEKE_FRCOEFF is
! negative, this conversion is not used or calculated.
MEKE_BHFRCOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of mean energy into MEKE by the biharmonic
! dissipation. If MEKE_bhFRCOEFF is negative, this conversion is not used or
! calculated.
MEKE_GMECOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of MEKE into mean energy by GME. If
! MEKE_GMECOEFF is negative, this conversion is not used or calculated.
Expand Down Expand Up @@ -978,6 +982,9 @@ RESOLN_SCALED_KHTR = False ! [Boolean] default = False
RESOLN_USE_EBT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic wave speed instead of first baroclinic
! wave for calculating the resolution fn.
BACKSCAT_EBT_POWER = 0.0 ! [nondim] default = 0.0
! Power to raise EBT vertical structure to when backscatter has vertical
! structure.
KHTH_USE_EBT_STRUCT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! thickness diffusivity.
Expand Down Expand Up @@ -1402,6 +1409,9 @@ BOUND_KH = True ! [Boolean] default = True
BETTER_BOUND_KH = True ! [Boolean] default = True
! If true, the Laplacian coefficient is locally limited to be stable with a
! better bounding than just BOUND_KH.
EY24_EBT_BS = False ! [Boolean] default = False
! If true, use the the backscatter scheme (EBT mode with kill switch)developed
! by Yankovsky et al. (2024).
ANISOTROPIC_VISCOSITY = False ! [Boolean] default = False
! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
ADD_LES_VISCOSITY = False ! [Boolean] default = False
Expand Down
10 changes: 10 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,10 @@ MEKE_EQUILIBRIUM_RESTORING = False ! [Boolean] default = False
MEKE_FRCOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of mean energy into MEKE. If MEKE_FRCOEFF is
! negative, this conversion is not used or calculated.
MEKE_BHFRCOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of mean energy into MEKE by the biharmonic
! dissipation. If MEKE_bhFRCOEFF is negative, this conversion is not used or
! calculated.
MEKE_GMECOEFF = -1.0 ! [nondim] default = -1.0
! The efficiency of the conversion of MEKE into mean energy by GME. If
! MEKE_GMECOEFF is negative, this conversion is not used or calculated.
Expand Down Expand Up @@ -978,6 +982,9 @@ RESOLN_SCALED_KHTR = False ! [Boolean] default = False
RESOLN_USE_EBT = False ! [Boolean] default = False
! If true, uses the equivalent barotropic wave speed instead of first baroclinic
! wave for calculating the resolution fn.
BACKSCAT_EBT_POWER = 0.0 ! [nondim] default = 0.0
! Power to raise EBT vertical structure to when backscatter has vertical
! structure.
KHTH_USE_EBT_STRUCT = True ! [Boolean] default = False
! If true, uses the equivalent barotropic structure as the vertical structure of
! thickness diffusivity.
Expand Down Expand Up @@ -1421,6 +1428,9 @@ BOUND_KH = True ! [Boolean] default = True
BETTER_BOUND_KH = True ! [Boolean] default = True
! If true, the Laplacian coefficient is locally limited to be stable with a
! better bounding than just BOUND_KH.
EY24_EBT_BS = False ! [Boolean] default = False
! If true, use the the backscatter scheme (EBT mode with kill switch)developed
! by Yankovsky et al. (2024).
ANISOTROPIC_VISCOSITY = False ! [Boolean] default = False
! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
ADD_LES_VISCOSITY = False ! [Boolean] default = False
Expand Down
Loading

0 comments on commit 642364e

Please sign in to comment.