From 3d37f13324fae35dea438940cb2570e0e763e055 Mon Sep 17 00:00:00 2001
From: He Wang <he.wang@noaa.gov>
Date: Thu, 3 Oct 2024 16:27:46 -0400
Subject: [PATCH] Change default of USE_POROUS_BARRIER to false

* subroutine initialize_MOM
* MOM_input in test cases
---
 .testing/tc0/MOM_input | 3 +++
 .testing/tc1/MOM_input | 3 +++
 .testing/tc2/MOM_input | 3 +++
 .testing/tc3/MOM_input | 3 +++
 .testing/tc4/MOM_input | 3 +++
 src/core/MOM.F90       | 2 +-
 6 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.testing/tc0/MOM_input b/.testing/tc0/MOM_input
index e4d1694e72..7a107486b2 100644
--- a/.testing/tc0/MOM_input
+++ b/.testing/tc0/MOM_input
@@ -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
diff --git a/.testing/tc1/MOM_input b/.testing/tc1/MOM_input
index 04204bd67f..098952ccc2 100644
--- a/.testing/tc1/MOM_input
+++ b/.testing/tc1/MOM_input
@@ -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
diff --git a/.testing/tc2/MOM_input b/.testing/tc2/MOM_input
index e142c64ff8..c8aad58e92 100644
--- a/.testing/tc2/MOM_input
+++ b/.testing/tc2/MOM_input
@@ -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
diff --git a/.testing/tc3/MOM_input b/.testing/tc3/MOM_input
index 6963feee98..6a1238ee96 100644
--- a/.testing/tc3/MOM_input
+++ b/.testing/tc3/MOM_input
@@ -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
diff --git a/.testing/tc4/MOM_input b/.testing/tc4/MOM_input
index c4ef8475a9..b985b8e082 100644
--- a/.testing/tc4/MOM_input
+++ b/.testing/tc4/MOM_input
@@ -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
diff --git a/src/core/MOM.F90 b/src/core/MOM.F90
index 638ffada32..655e3d162c 100644
--- a/src/core/MOM.F90
+++ b/src/core/MOM.F90
@@ -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 "//&