Skip to content

Commit

Permalink
Change default of USE_POROUS_BARRIER to false
Browse files Browse the repository at this point in the history
* subroutine initialize_MOM
* MOM_input in test cases
  • Loading branch information
herrwang0 authored and adcroft committed Oct 30, 2024
1 parent e189e05 commit 3d37f13
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .testing/tc0/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ ADIABATIC = True ! [Boolean] default = False
! true. This assumes that KD = KDML = 0.0 and that
! there is no buoyancy forcing, but makes the model
! faster by eliminating subroutine calls.
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.
DT = 8.64E+04 ! [s]
! The (baroclinic) dynamics time step. The time-step that
! is actually used will be an integer fraction of the
Expand Down
3 changes: 3 additions & 0 deletions .testing/tc1/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ MIXEDLAYER_RESTRAT = True ! [Boolean] default = False
! If true, a density-gradient dependent re-stratifying
! flow is imposed in the mixed layer.
! This is only used if BULKMIXEDLAYER is 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.
DT = 900.0 ! [s]
! The (baroclinic) dynamics time step. The time-step that
! is actually used will be an integer fraction of the
Expand Down
3 changes: 3 additions & 0 deletions .testing/tc2/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ MIXEDLAYER_RESTRAT = True ! [Boolean] default = False
! If true, a density-gradient dependent re-stratifying
! flow is imposed in the mixed layer.
! This is only used if BULKMIXEDLAYER is 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.
DT = 3600.0 ! [s]
! The (baroclinic) dynamics time step. The time-step that
! is actually used will be an integer fraction of the
Expand Down
3 changes: 3 additions & 0 deletions .testing/tc3/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ NK = 10 ! [nondim]
ENABLE_THERMODYNAMICS = False ! [Boolean] default = True
! If true, Temperature and salinity are used as state
! variables.
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.
DT = 120.0 ! [s]
! The (baroclinic) dynamics time step. The time-step that
! is actually used will be an integer fraction of the
Expand Down
3 changes: 3 additions & 0 deletions .testing/tc4/MOM_input
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
USE_REGRIDDING = True ! [Boolean] default = False
! If True, use the ALE algorithm (regridding/remapping). If False, use the
! layered isopycnal algorithm.
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.
DT = 1200.0 ! [s]
! The (baroclinic) dynamics time step. The time-step that is actually used will
! be an integer fraction of the forcing time-step (DT_FORCING in ocean-only mode
Expand Down
2 changes: 1 addition & 1 deletion src/core/MOM.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2313,7 +2313,7 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, &
call get_param(param_file, "MOM", "USE_POROUS_BARRIER", CS%use_porbar, &
"If true, use porous barrier to constrain the widths "//&
"and face areas at the edges of the grid cells. ", &
default=.true.) ! The default should be false after tests.
default=.false.)
call get_param(param_file, "MOM", "BATHYMETRY_AT_VEL", bathy_at_vel, &
"If true, there are separate values for the basin depths "//&
"at velocity points. Otherwise the effects of topography "//&
Expand Down

0 comments on commit 3d37f13

Please sign in to comment.