Skip to content

Commit

Permalink
MOM6: Change default of USE_POROUS_BARRIER to false
Browse files Browse the repository at this point in the history
- NOAA-GFDL/MOM6@3d37f1332 Change default of USE_POROUS_BARRIER to false
- NOAA-GFDL/MOM6@e189e05df +Eliminated h_neglect argument to remapping_core_h
- NOAA-GFDL/MOM6@795e982c4 Switch runner and allow for more run time
- NOAA-GFDL/MOM6@79979a9d6 Update version of checkout action (@v4)
- NOAA-GFDL/MOM6@80d8b5ff0 Bugfix in MOM_porous_barriers
- NOAA-GFDL/MOM6@f90b071b1 Ice-shelf FMAs (#729)
- NOAA-GFDL/MOM6@b240e7ee5 change default for ice-shelf nonlin_solve_err_mode to 3
- NOAA-GFDL/MOM6@9d4f9d1c8 Use loops instead of array syntax when calculating ice-shelf diagnostics. Also fixed incorrect loop bounds for a seldom-used ice-shelf convergence criterion
- NOAA-GFDL/MOM6@cfa8a3d08 New diagnostics for flux divergence, strain-rates, deviatorics stresses, and ice speed; and the magnitude of ice surface slope and driving stress. Fixed some misleading units for variables related to ice viscosity
- NOAA-GFDL/MOM6@5dcc8e024 Fix .testing make for regression tests
- NOAA-GFDL/MOM6@e24cd3aa1 change CMOR names, fixes #709
  • Loading branch information
mom6bot authored and adcroft committed Oct 30, 2024
1 parent 3c1037e commit c5dec73
Show file tree
Hide file tree
Showing 125 changed files with 62 additions and 1,293 deletions.
19 changes: 1 addition & 18 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ APPLY_INTERFACE_FILTER = False ! [Boolean] default = False
THICKNESSDIFFUSE_FIRST = True ! [Boolean] default = False
! If true, do thickness diffusion or interface height smoothing before dynamics.
! This is only used if THICKNESSDIFFUSE or APPLY_INTERFACE_FILTER is true.
USE_POROUS_BARRIER = True ! [Boolean] default = True
USE_POROUS_BARRIER = False ! [Boolean] default = False
! If true, use porous barrier to constrain the widths and face areas at the
! edges of the grid cells.
BATHYMETRY_AT_VEL = False ! [Boolean] default = False
Expand Down Expand Up @@ -939,23 +939,6 @@ STOCH_EOS = False ! [Boolean] default = False
STANLEY_COEFF = -1.0 ! [nondim] default = -1.0
! Coefficient correlating the temperature gradient and SGS T variance.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .
PORBAR_MASKING_DEPTH = 0.0 ! [m] default = 0.0
! If the effective average depth at the velocity cell is shallower than this
! number, then porous barrier is not applied at that location.
! PORBAR_MASKING_DEPTH is assumed to be positive below the sea surface.
PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! A string describing the method that decides how the interface heights at the
! velocity points are calculated. Valid values are:
! MAX (the default) - maximum of the adjacent cells
! MIN - minimum of the adjacent cells
! ARITHMETIC - arithmetic mean of the adjacent cells
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_split_RK2 ===
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,12 +263,6 @@ KHTH = 10.0 ! [m2 s-1] default = 0.0
KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0
! The maximum horizontal thickness diffusivity.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity_PPM ===
Expand Down
19 changes: 1 addition & 18 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ APPLY_INTERFACE_FILTER = False ! [Boolean] default = False
THICKNESSDIFFUSE_FIRST = True ! [Boolean] default = False
! If true, do thickness diffusion or interface height smoothing before dynamics.
! This is only used if THICKNESSDIFFUSE or APPLY_INTERFACE_FILTER is true.
USE_POROUS_BARRIER = True ! [Boolean] default = True
USE_POROUS_BARRIER = False ! [Boolean] default = False
! If true, use porous barrier to constrain the widths and face areas at the
! edges of the grid cells.
BATHYMETRY_AT_VEL = False ! [Boolean] default = False
Expand Down Expand Up @@ -939,23 +939,6 @@ STOCH_EOS = False ! [Boolean] default = False
STANLEY_COEFF = -1.0 ! [nondim] default = -1.0
! Coefficient correlating the temperature gradient and SGS T variance.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .
PORBAR_MASKING_DEPTH = 0.0 ! [m] default = 0.0
! If the effective average depth at the velocity cell is shallower than this
! number, then porous barrier is not applied at that location.
! PORBAR_MASKING_DEPTH is assumed to be positive below the sea surface.
PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! A string describing the method that decides how the interface heights at the
! velocity points are calculated. Valid values are:
! MAX (the default) - maximum of the adjacent cells
! MIN - minimum of the adjacent cells
! ARITHMETIC - arithmetic mean of the adjacent cells
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_split_RK2 ===
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,6 @@ KHTH = 10.0 ! [m2 s-1] default = 0.0
KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0
! The maximum horizontal thickness diffusivity.

! === module MOM_porous_barriers ===

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity_PPM ===
Expand Down
19 changes: 1 addition & 18 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ APPLY_INTERFACE_FILTER = False ! [Boolean] default = False
THICKNESSDIFFUSE_FIRST = True ! [Boolean] default = False
! If true, do thickness diffusion or interface height smoothing before dynamics.
! This is only used if THICKNESSDIFFUSE or APPLY_INTERFACE_FILTER is true.
USE_POROUS_BARRIER = True ! [Boolean] default = True
USE_POROUS_BARRIER = False ! [Boolean] default = False
! If true, use porous barrier to constrain the widths and face areas at the
! edges of the grid cells.
BATHYMETRY_AT_VEL = False ! [Boolean] default = False
Expand Down Expand Up @@ -939,23 +939,6 @@ STOCH_EOS = False ! [Boolean] default = False
STANLEY_COEFF = -1.0 ! [nondim] default = -1.0
! Coefficient correlating the temperature gradient and SGS T variance.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .
PORBAR_MASKING_DEPTH = 0.0 ! [m] default = 0.0
! If the effective average depth at the velocity cell is shallower than this
! number, then porous barrier is not applied at that location.
! PORBAR_MASKING_DEPTH is assumed to be positive below the sea surface.
PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! A string describing the method that decides how the interface heights at the
! velocity points are calculated. Valid values are:
! MAX (the default) - maximum of the adjacent cells
! MIN - minimum of the adjacent cells
! ARITHMETIC - arithmetic mean of the adjacent cells
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_split_RK2 ===
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,6 @@ KHTH = 10.0 ! [m2 s-1] default = 0.0
KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0
! The maximum horizontal thickness diffusivity.

! === module MOM_porous_barriers ===

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity_PPM ===
Expand Down
19 changes: 1 addition & 18 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ APPLY_INTERFACE_FILTER = False ! [Boolean] default = False
THICKNESSDIFFUSE_FIRST = True ! [Boolean] default = False
! If true, do thickness diffusion or interface height smoothing before dynamics.
! This is only used if THICKNESSDIFFUSE or APPLY_INTERFACE_FILTER is true.
USE_POROUS_BARRIER = True ! [Boolean] default = True
USE_POROUS_BARRIER = False ! [Boolean] default = False
! If true, use porous barrier to constrain the widths and face areas at the
! edges of the grid cells.
BATHYMETRY_AT_VEL = False ! [Boolean] default = False
Expand Down Expand Up @@ -939,23 +939,6 @@ STOCH_EOS = False ! [Boolean] default = False
STANLEY_COEFF = -1.0 ! [nondim] default = -1.0
! Coefficient correlating the temperature gradient and SGS T variance.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .
PORBAR_MASKING_DEPTH = 0.0 ! [m] default = 0.0
! If the effective average depth at the velocity cell is shallower than this
! number, then porous barrier is not applied at that location.
! PORBAR_MASKING_DEPTH is assumed to be positive below the sea surface.
PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! A string describing the method that decides how the interface heights at the
! velocity points are calculated. Valid values are:
! MAX (the default) - maximum of the adjacent cells
! MIN - minimum of the adjacent cells
! ARITHMETIC - arithmetic mean of the adjacent cells
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_split_RK2 ===
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
Expand Down
2 changes: 0 additions & 2 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,6 @@ KHTH = 10.0 ! [m2 s-1] default = 0.0
KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0
! The maximum horizontal thickness diffusivity.

! === module MOM_porous_barriers ===

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity_PPM ===
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ APPLY_INTERFACE_FILTER = False ! [Boolean] default = False
THICKNESSDIFFUSE_FIRST = True ! [Boolean] default = False
! If true, do thickness diffusion or interface height smoothing before dynamics.
! This is only used if THICKNESSDIFFUSE or APPLY_INTERFACE_FILTER is true.
USE_POROUS_BARRIER = True ! [Boolean] default = True
USE_POROUS_BARRIER = False ! [Boolean] default = False
! If true, use porous barrier to constrain the widths and face areas at the
! edges of the grid cells.
BATHYMETRY_AT_VEL = False ! [Boolean] default = False
Expand Down Expand Up @@ -1092,23 +1092,6 @@ STOCH_EOS = False ! [Boolean] default = False
STANLEY_COEFF = -1.0 ! [nondim] default = -1.0
! Coefficient correlating the temperature gradient and SGS T variance.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 99991231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .
PORBAR_MASKING_DEPTH = 0.0 ! [m] default = 0.0
! If the effective average depth at the velocity cell is shallower than this
! number, then porous barrier is not applied at that location.
! PORBAR_MASKING_DEPTH is assumed to be positive below the sea surface.
PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! A string describing the method that decides how the interface heights at the
! velocity points are calculated. Valid values are:
! MAX (the default) - maximum of the adjacent cells
! MIN - minimum of the adjacent cells
! ARITHMETIC - arithmetic mean of the adjacent cells
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_split_RK2 ===
TIDES = True ! [Boolean] default = False
! If true, apply tidal momentum forcing.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,6 @@ KHTH = 600.0 ! [m2 s-1] default = 0.0
KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0
! The maximum horizontal thickness diffusivity.

! === module MOM_porous_barriers ===

! === module MOM_dynamics_split_RK2 ===
TIDES = True ! [Boolean] default = False
! If true, apply tidal momentum forcing.
Expand Down
19 changes: 1 addition & 18 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ APPLY_INTERFACE_FILTER = False ! [Boolean] default = False
THICKNESSDIFFUSE_FIRST = True ! [Boolean] default = False
! If true, do thickness diffusion or interface height smoothing before dynamics.
! This is only used if THICKNESSDIFFUSE or APPLY_INTERFACE_FILTER is true.
USE_POROUS_BARRIER = True ! [Boolean] default = True
USE_POROUS_BARRIER = False ! [Boolean] default = False
! If true, use porous barrier to constrain the widths and face areas at the
! edges of the grid cells.
BATHYMETRY_AT_VEL = False ! [Boolean] default = False
Expand Down Expand Up @@ -1188,23 +1188,6 @@ STOCH_EOS = False ! [Boolean] default = False
STANLEY_COEFF = -1.0 ! [nondim] default = -1.0
! Coefficient correlating the temperature gradient and SGS T variance.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .
PORBAR_MASKING_DEPTH = 0.0 ! [m] default = 0.0
! If the effective average depth at the velocity cell is shallower than this
! number, then porous barrier is not applied at that location.
! PORBAR_MASKING_DEPTH is assumed to be positive below the sea surface.
PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! A string describing the method that decides how the interface heights at the
! velocity points are calculated. Valid values are:
! MAX (the default) - maximum of the adjacent cells
! MIN - minimum of the adjacent cells
! ARITHMETIC - arithmetic mean of the adjacent cells
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_split_RK2 ===
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
Expand Down
6 changes: 0 additions & 6 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -388,12 +388,6 @@ USE_GM_WORK_BUG = True ! [Boolean] default = False
! If true, compute the top-layer work tendency on the u-grid with the incorrect
! sign, for legacy reproducibility.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity_PPM ===
Expand Down
19 changes: 1 addition & 18 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ APPLY_INTERFACE_FILTER = False ! [Boolean] default = False
THICKNESSDIFFUSE_FIRST = True ! [Boolean] default = False
! If true, do thickness diffusion or interface height smoothing before dynamics.
! This is only used if THICKNESSDIFFUSE or APPLY_INTERFACE_FILTER is true.
USE_POROUS_BARRIER = True ! [Boolean] default = True
USE_POROUS_BARRIER = False ! [Boolean] default = False
! If true, use porous barrier to constrain the widths and face areas at the
! edges of the grid cells.
BATHYMETRY_AT_VEL = False ! [Boolean] default = False
Expand Down Expand Up @@ -1202,23 +1202,6 @@ STOCH_EOS = False ! [Boolean] default = False
STANLEY_COEFF = -1.0 ! [nondim] default = -1.0
! Coefficient correlating the temperature gradient and SGS T variance.

! === module MOM_porous_barriers ===
PORBAR_ANSWER_DATE = 99991231 ! default = 20181231
! The vintage of the porous barrier weight function calculations. Values below
! 20220806 recover the old answers in which the layer averaged weights are not
! strictly limited by an upper-bound of 1.0 .
PORBAR_MASKING_DEPTH = 0.0 ! [m] default = 0.0
! If the effective average depth at the velocity cell is shallower than this
! number, then porous barrier is not applied at that location.
! PORBAR_MASKING_DEPTH is assumed to be positive below the sea surface.
PORBAR_ETA_INTERP = "MAX" ! default = "MAX"
! A string describing the method that decides how the interface heights at the
! velocity points are calculated. Valid values are:
! MAX (the default) - maximum of the adjacent cells
! MIN - minimum of the adjacent cells
! ARITHMETIC - arithmetic mean of the adjacent cells
! HARMONIC - harmonic mean of the adjacent cells

! === module MOM_dynamics_split_RK2 ===
TIDES = False ! [Boolean] default = False
! If true, apply tidal momentum forcing.
Expand Down
Loading

0 comments on commit c5dec73

Please sign in to comment.