From c5dec736cfdcc6c756550ab919028024e631494f Mon Sep 17 00:00:00 2001 From: MOM6 bot Date: Wed, 30 Oct 2024 16:38:02 -0400 Subject: [PATCH] MOM6: Change default of USE_POROUS_BARRIER to false - 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 --- .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 19 +-------------- .../MOM_parameter_doc.short | 6 ----- .../Concurrent_ice_1deg/MOM_parameter_doc.all | 19 +-------------- .../MOM_parameter_doc.short | 2 -- .../MOM_parameter_doc.all | 19 +-------------- .../MOM_parameter_doc.short | 2 -- ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 19 +-------------- ice_ocean_SIS2/Baltic/MOM_parameter_doc.short | 2 -- .../MOM_parameter_doc.all | 19 +-------------- .../MOM_parameter_doc.short | 2 -- .../Baltic_OM4_025/MOM_parameter_doc.all | 19 +-------------- .../Baltic_OM4_025/MOM_parameter_doc.short | 6 ----- .../Baltic_OM4_05/MOM_parameter_doc.all | 19 +-------------- .../Baltic_OM4_05/MOM_parameter_doc.short | 6 ----- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 19 +-------------- .../OM4_025/MOM_parameter_doc.short | 6 ----- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 19 +-------------- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short | 6 ----- ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all | 19 +-------------- .../OM_1deg/MOM_parameter_doc.short | 6 ----- ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 19 +-------------- ice_ocean_SIS2/SIS2/MOM_parameter_doc.short | 2 -- .../SIS2_bergs_cgrid/MOM_parameter_doc.all | 19 +-------------- .../SIS2_bergs_cgrid/MOM_parameter_doc.short | 2 -- .../SIS2_cgrid/MOM_parameter_doc.all | 19 +-------------- .../SIS2_cgrid/MOM_parameter_doc.short | 2 -- .../cooling_only/BML/MOM_parameter_doc.all | 19 +-------------- .../cooling_only/BML/MOM_parameter_doc.short | 2 -- .../cooling_only/EPBL/MOM_parameter_doc.all | 19 +-------------- .../cooling_only/EPBL/MOM_parameter_doc.short | 2 -- .../cooling_only/KPP/MOM_parameter_doc.all | 19 +-------------- .../cooling_only/KPP/MOM_parameter_doc.short | 2 -- .../mech_only/BML/MOM_parameter_doc.all | 19 +-------------- .../mech_only/BML/MOM_parameter_doc.short | 2 -- .../mech_only/EPBL/MOM_parameter_doc.all | 19 +-------------- .../mech_only/EPBL/MOM_parameter_doc.short | 2 -- .../mech_only/KPP/MOM_parameter_doc.all | 19 +-------------- .../mech_only/KPP/MOM_parameter_doc.short | 2 -- .../BML/MOM_parameter_doc.all | 19 +-------------- .../BML/MOM_parameter_doc.short | 2 -- .../EPBL/MOM_parameter_doc.all | 19 +-------------- .../EPBL/MOM_parameter_doc.short | 2 -- .../KPP/MOM_parameter_doc.all | 19 +-------------- .../KPP/MOM_parameter_doc.short | 2 -- .../wind_only/BML/MOM_parameter_doc.all | 19 +-------------- .../wind_only/BML/MOM_parameter_doc.short | 2 -- .../wind_only/EPBL/MOM_parameter_doc.all | 19 +-------------- .../wind_only/EPBL/MOM_parameter_doc.short | 2 -- .../wind_only/KPP/MOM_parameter_doc.all | 19 +-------------- .../wind_only/KPP/MOM_parameter_doc.short | 2 -- ocean_only/DOME/MOM_parameter_doc.all | 19 +-------------- ocean_only/DOME/MOM_parameter_doc.short | 2 -- .../Phillips_2layer/MOM_parameter_doc.all | 19 +-------------- .../Phillips_2layer/MOM_parameter_doc.short | 2 -- .../MOM_parameter_doc.all | 19 +-------------- .../MOM_parameter_doc.short | 2 -- .../adjustment2d/layer/MOM_parameter_doc.all | 19 +-------------- .../layer/MOM_parameter_doc.short | 2 -- .../adjustment2d/rho/MOM_parameter_doc.all | 19 +-------------- .../adjustment2d/rho/MOM_parameter_doc.short | 2 -- .../adjustment2d/z/MOM_parameter_doc.all | 19 +-------------- .../adjustment2d/z/MOM_parameter_doc.short | 2 -- ocean_only/benchmark/MOM_parameter_doc.all | 19 +-------------- ocean_only/benchmark/MOM_parameter_doc.short | 2 -- ocean_only/circle_obcs/MOM_parameter_doc.all | 19 +-------------- .../circle_obcs/MOM_parameter_doc.short | 2 -- ocean_only/double_gyre/MOM_parameter_doc.all | 19 +-------------- .../double_gyre/MOM_parameter_doc.short | 2 -- .../external_gwave/MOM_parameter_doc.all | 19 +-------------- .../external_gwave/MOM_parameter_doc.short | 2 -- .../layer/MOM_parameter_doc.all | 19 +-------------- .../layer/MOM_parameter_doc.short | 2 -- .../flow_downslope/rho/MOM_parameter_doc.all | 19 +-------------- .../rho/MOM_parameter_doc.short | 2 -- .../sigma/MOM_parameter_doc.all | 19 +-------------- .../sigma/MOM_parameter_doc.short | 2 -- .../flow_downslope/z/MOM_parameter_doc.all | 19 +-------------- .../flow_downslope/z/MOM_parameter_doc.short | 2 -- .../global_ALE/hycom/MOM_parameter_doc.all | 19 +-------------- .../global_ALE/hycom/MOM_parameter_doc.short | 2 -- .../global_ALE/layer/MOM_parameter_doc.all | 19 +-------------- .../global_ALE/layer/MOM_parameter_doc.short | 2 -- .../global_ALE/layer/available_diags.000000 | 24 ------------------- ocean_only/global_ALE/z/MOM_parameter_doc.all | 19 +-------------- .../global_ALE/z/MOM_parameter_doc.short | 2 -- .../global_ALE/z/available_diags.000000 | 24 ------------------- .../lock_exchange/MOM_parameter_doc.all | 19 +-------------- .../lock_exchange/MOM_parameter_doc.short | 2 -- .../MOM_parameter_doc.all | 19 +-------------- .../MOM_parameter_doc.short | 2 -- .../nonBous_global/MOM_parameter_doc.all | 15 +----------- .../nonBous_global/MOM_parameter_doc.short | 2 -- .../resting/layer/MOM_parameter_doc.all | 19 +-------------- .../resting/layer/MOM_parameter_doc.short | 2 -- ocean_only/resting/z/MOM_parameter_doc.all | 19 +-------------- ocean_only/resting/z/MOM_parameter_doc.short | 2 -- .../seamount/layer/MOM_parameter_doc.all | 19 +-------------- .../seamount/layer/MOM_parameter_doc.short | 2 -- ocean_only/seamount/rho/MOM_parameter_doc.all | 19 +-------------- .../seamount/rho/MOM_parameter_doc.short | 2 -- .../seamount/sigma/MOM_parameter_doc.all | 19 +-------------- .../seamount/sigma/MOM_parameter_doc.short | 2 -- ocean_only/seamount/z/MOM_parameter_doc.all | 19 +-------------- ocean_only/seamount/z/MOM_parameter_doc.short | 2 -- .../single_column/BML/MOM_parameter_doc.all | 19 +-------------- .../single_column/BML/MOM_parameter_doc.short | 2 -- .../single_column/EPBL/MOM_parameter_doc.all | 19 +-------------- .../EPBL/MOM_parameter_doc.short | 2 -- .../single_column/KPP/MOM_parameter_doc.all | 19 +-------------- .../single_column/KPP/MOM_parameter_doc.short | 2 -- .../sloshing/layer/MOM_parameter_doc.all | 19 +-------------- .../sloshing/layer/MOM_parameter_doc.short | 2 -- ocean_only/sloshing/rho/MOM_parameter_doc.all | 19 +-------------- .../sloshing/rho/MOM_parameter_doc.short | 2 -- ocean_only/sloshing/z/MOM_parameter_doc.all | 19 +-------------- ocean_only/sloshing/z/MOM_parameter_doc.short | 2 -- .../MOM_parameter_doc.all | 19 +-------------- .../MOM_parameter_doc.short | 2 -- .../tracer_mixing/rho/MOM_parameter_doc.all | 19 +-------------- .../tracer_mixing/rho/MOM_parameter_doc.short | 2 -- .../tracer_mixing/z/MOM_parameter_doc.all | 19 +-------------- .../tracer_mixing/z/MOM_parameter_doc.short | 2 -- ocean_only/unit_tests/MOM_parameter_doc.all | 19 +-------------- ocean_only/unit_tests/MOM_parameter_doc.short | 6 ----- src/MOM6 | 2 +- 125 files changed, 62 insertions(+), 1293 deletions(-) diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index caecdfd79..fa7a10863 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -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 @@ -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. diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short index 2957bf469..bd7b05ab9 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short @@ -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 === diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index 0742dfeb7..a263cfb83 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -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 @@ -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. diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short index e57ed5060..f91a0c56c 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short @@ -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 === diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all index 204657703..c27082527 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all @@ -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 @@ -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. diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.short index 79dd91465..3ad2587d5 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.short @@ -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 === diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index ce2e62cc9..02ce03c8e 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -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 @@ -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. diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short index 703b02bcd..214d591bd 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short @@ -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 === diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all index 8274cf6ec..48e9edab2 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all @@ -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 @@ -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. diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short index c95d691f6..5c2b23b22 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short @@ -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. diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all index 9db4736c9..fb6e5c190 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -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 @@ -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. diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short index b8e4c0d64..b9ce51537 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short @@ -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 === diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all index a6ab4fbe5..e0b4ea8f1 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -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 @@ -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. diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short index d6369d961..95fda02c3 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short @@ -405,12 +405,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 === diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 6204b6c42..a695f9732 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -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 @@ -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. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index a4f2226d4..e4caacd1a 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -395,12 +395,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 === diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 56e1cae28..922651d24 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -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 @@ -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. diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index 989f71890..7f834b681 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -410,12 +410,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 === diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index 9c5522342..934244b14 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -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 @@ -1179,23 +1179,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. diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short index 0442bf746..3a4b08048 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short @@ -424,12 +424,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 === diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 383c7a727..9bcf88639 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -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 @@ -905,23 +905,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. diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short index cac1b7198..14dd8ad04 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short @@ -285,8 +285,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 === diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 34ca485e2..81855cf31 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -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 @@ -905,23 +905,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. diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short index 84320a23f..7d654105b 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short @@ -285,8 +285,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 === diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 2d4623870..2764a9eae 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -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 @@ -905,23 +905,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. diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short index 4127095d2..8a1cf0354 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short @@ -285,8 +285,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 === diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all index 97b1c5574..9e2c16637 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all @@ -47,7 +47,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -734,23 +734,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short index 874068739..883fba760 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short @@ -192,8 +192,6 @@ KV = 0.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all index c5d4bb3c1..e7ca7412c 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all @@ -56,7 +56,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -853,23 +853,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short index 562800a39..a4ed5a704 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short @@ -221,8 +221,6 @@ KV = 0.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all index 5952918e6..edd3f055d 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all @@ -56,7 +56,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -853,23 +853,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short index 37e3a1589..4e5a0ffcd 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short @@ -221,8 +221,6 @@ KV = 0.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all index ccdfe87db..daf2445a3 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all @@ -47,7 +47,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -734,23 +734,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short index f6177f259..5e3746feb 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short @@ -192,8 +192,6 @@ KV = 0.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all index 2e160b119..4fccf89bc 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all @@ -56,7 +56,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -853,23 +853,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short index 5d3657c61..32e583a48 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short @@ -221,8 +221,6 @@ KV = 0.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all index 5446c1892..d30bf91f8 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all @@ -56,7 +56,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -853,23 +853,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short index 435891fd3..1a399f3eb 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short @@ -221,8 +221,6 @@ KV = 0.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all index a471436b3..f71da53f9 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all @@ -47,7 +47,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -734,23 +734,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short index 09efbe19c..066d1cf6a 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short @@ -190,8 +190,6 @@ KV = 0.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all index 004e0d55e..c258f4e03 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all @@ -56,7 +56,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -853,23 +853,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short index d98be9c71..13a9e8a34 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short @@ -219,8 +219,6 @@ KV = 0.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all index cc1ccc16f..d027b9d1e 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all @@ -56,7 +56,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -853,23 +853,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short index a64a4e9fb..221817725 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short @@ -219,8 +219,6 @@ KV = 0.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all index c099b03d3..e1da4bea4 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all @@ -47,7 +47,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -734,23 +734,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short index 0142ed080..c48797632 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short @@ -192,8 +192,6 @@ KV = 0.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all index 4d1906972..410ebd1a3 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all @@ -56,7 +56,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -853,23 +853,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short index 46f771352..1396f1094 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short @@ -221,8 +221,6 @@ KV = 0.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all index 7f4545c4a..a1269a531 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all @@ -56,7 +56,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -853,23 +853,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short index 9e7148577..243c9cbe5 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short @@ -221,8 +221,6 @@ KV = 0.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 6fc3127ef..c2601989f 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -52,7 +52,7 @@ APPLY_INTERFACE_FILTER = False ! [Boolean] default = False THICKNESSDIFFUSE_FIRST = False ! [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 @@ -773,23 +773,6 @@ USE_GM_WORK_BUG = False ! [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 = 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. diff --git a/ocean_only/DOME/MOM_parameter_doc.short b/ocean_only/DOME/MOM_parameter_doc.short index ae3408a1f..a580023f1 100644 --- a/ocean_only/DOME/MOM_parameter_doc.short +++ b/ocean_only/DOME/MOM_parameter_doc.short @@ -246,8 +246,6 @@ KV = 1.0E-04 ! [m2 s-1] KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === ! === module MOM_continuity_PPM === diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index bc7c562bc..f6a4b6273 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -52,7 +52,7 @@ APPLY_INTERFACE_FILTER = False ! [Boolean] default = False THICKNESSDIFFUSE_FIRST = False ! [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 @@ -710,23 +710,6 @@ USE_GM_WORK_BUG = False ! [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 = 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. diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.short b/ocean_only/Phillips_2layer/MOM_parameter_doc.short index 1c418648d..67b22a45b 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.short +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.short @@ -244,8 +244,6 @@ KV = 1.0E-04 ! [m2 s-1] KHTH = 8000.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === ! === module MOM_continuity_PPM === diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 62683798b..2f0d8dc2b 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -56,7 +56,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -853,23 +853,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short index 72539c855..d4e12e1d8 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short @@ -194,8 +194,6 @@ KV = 1.0E-04 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 8db5fa721..927de7d48 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -49,7 +49,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -756,23 +756,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. diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short index 140e27c68..ab882552a 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short @@ -242,8 +242,6 @@ KV = 1.0E-06 ! [m2 s-1] KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === ! === module MOM_continuity_PPM === diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 27245e6da..cd3304e3b 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -920,23 +920,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. diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short index 36f94a2e9..e2ec8a53b 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short @@ -290,8 +290,6 @@ KV = 1.0E-06 ! [m2 s-1] KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === ! === module MOM_continuity_PPM === diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index ea82f7253..ae3953e6e 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -872,23 +872,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. diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.short b/ocean_only/adjustment2d/z/MOM_parameter_doc.short index ac714a7e8..b7bc9dc95 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.short @@ -268,8 +268,6 @@ KV = 1.0E-06 ! [m2 s-1] KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === ! === module MOM_continuity_PPM === diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 7c14b1766..ee1dae0c7 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -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 @@ -849,23 +849,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. diff --git a/ocean_only/benchmark/MOM_parameter_doc.short b/ocean_only/benchmark/MOM_parameter_doc.short index e51170a19..4c5db5650 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.short +++ b/ocean_only/benchmark/MOM_parameter_doc.short @@ -271,8 +271,6 @@ KHTH = 1.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 === diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 953eb9b4b..110227a9d 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -49,7 +49,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -771,23 +771,6 @@ USE_GM_WORK_BUG = False ! [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 = 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. diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.short b/ocean_only/circle_obcs/MOM_parameter_doc.short index 0f98b4c90..6f7e669cc 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.short +++ b/ocean_only/circle_obcs/MOM_parameter_doc.short @@ -222,8 +222,6 @@ KV = 1.0E-04 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === ! === module MOM_continuity_PPM === diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 09859079c..98a30b853 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -49,7 +49,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -639,23 +639,6 @@ USE_GM_WORK_BUG = False ! [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 = 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. diff --git a/ocean_only/double_gyre/MOM_parameter_doc.short b/ocean_only/double_gyre/MOM_parameter_doc.short index b8901f86a..85eb38e34 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.short +++ b/ocean_only/double_gyre/MOM_parameter_doc.short @@ -144,8 +144,6 @@ KV = 1.0E-04 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === ! === module MOM_continuity_PPM === diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index e72e2f8f9..bb2c23c22 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -49,7 +49,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -745,23 +745,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. diff --git a/ocean_only/external_gwave/MOM_parameter_doc.short b/ocean_only/external_gwave/MOM_parameter_doc.short index 41619b190..7fec004f9 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.short +++ b/ocean_only/external_gwave/MOM_parameter_doc.short @@ -236,8 +236,6 @@ KV_BBL_MIN = 1.0E-06 ! [m2 s-1] default = 1.0E-04 ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === ! === module MOM_continuity_PPM === diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 67c9abb37..96692e1fa 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -49,7 +49,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -755,23 +755,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. diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short index f9b20a9c1..469ae147d 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short @@ -237,8 +237,6 @@ KV = 1.0E-04 ! [m2 s-1] KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index 13dd8f063..258517f92 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -921,23 +921,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. diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short index 692ec4e91..4f3ee56c1 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short @@ -287,8 +287,6 @@ KV = 1.0E-04 ! [m2 s-1] KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index ca3ac37d1..2bff2e374 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -873,23 +873,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. diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short index e3488c795..154a763fe 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short @@ -263,8 +263,6 @@ KV = 1.0E-04 ! [m2 s-1] KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 12ecb04bc..667f92d9e 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -873,23 +873,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. diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.short b/ocean_only/flow_downslope/z/MOM_parameter_doc.short index a3d53bec3..c093b2d25 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.short @@ -263,8 +263,6 @@ KV = 1.0E-04 ! [m2 s-1] KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index fcc5f363a..fe8e75ac9 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -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 @@ -1142,23 +1142,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. diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short index 3fd07c2a1..d52f427c6 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short @@ -310,8 +310,6 @@ FGNV_C_MIN = 0.01 ! [m s-1] default = 0.0 ! A minium wave speed used in the Ferrari et al., 2010, streamfunction ! formulation. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === TIDES = True ! [Boolean] default = False ! If true, apply tidal momentum forcing. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 43bd76154..04affed35 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -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 @@ -1026,23 +1026,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. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.short b/ocean_only/global_ALE/layer/MOM_parameter_doc.short index d94b3d6c1..f9c2a4e75 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.short @@ -237,8 +237,6 @@ FGNV_C_MIN = 0.01 ! [m s-1] default = 0.0 ! A minium wave speed used in the Ferrari et al., 2010, streamfunction ! formulation. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === TIDES = True ! [Boolean] default = False ! If true, apply tidal momentum forcing. diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index 27eb0231d..05493443b 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -407,30 +407,6 @@ ! units: m3 s-1 ! cell_methods: xh:mean yq:point zi:point ! variants: {GM_sfn_unlim_y,GM_sfn_unlim_y_xyave} -"por_layer_widthU" [Unused] - ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2} - ! long_name: Porous barrier open width fraction (at the layer interfaces) of the u-faces - ! units: nondim - ! cell_methods: xq:point yh:mean zi:point - ! variants: {por_layer_widthU,por_layer_widthU_xyave} -"por_layer_widthV" [Unused] - ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2} - ! long_name: Porous barrier open width fraction (at the layer interfaces) of the v-faces - ! units: nondim - ! cell_methods: xh:mean yq:point zi:point - ! variants: {por_layer_widthV,por_layer_widthV_xyave} -"por_face_areaU" [Unused] - ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2} - ! long_name: Porous barrier open area fraction (layer averaged) of U-faces - ! units: nondim - ! cell_methods: xq:point yh:mean zl:mean - ! variants: {por_face_areaU,por_face_areaU_xyave} -"por_face_areaV" [Unused] - ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2} - ! long_name: Porous barrier open area fraction (layer averaged) of V-faces - ! units: nondim - ! cell_methods: xh:mean yq:point zl:mean - ! variants: {por_face_areaV,por_face_areaV_xyave} "RV" [Unused] ! modules: {ocean_model,ocean_model_d2} ! long_name: Relative Vorticity diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 47525bda6..4d9654cea 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -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 @@ -1089,23 +1089,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. diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.short b/ocean_only/global_ALE/z/MOM_parameter_doc.short index 2341034b6..fc58dede0 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.short @@ -285,8 +285,6 @@ FGNV_C_MIN = 0.01 ! [m s-1] default = 0.0 ! A minium wave speed used in the Ferrari et al., 2010, streamfunction ! formulation. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === TIDES = True ! [Boolean] default = False ! If true, apply tidal momentum forcing. diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 3442b6203..805798007 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -429,30 +429,6 @@ ! units: m3 s-1 ! cell_methods: xh:mean yq:point zi:point ! variants: {GM_sfn_unlim_y,GM_sfn_unlim_y_xyave} -"por_layer_widthU" [Unused] - ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2} - ! long_name: Porous barrier open width fraction (at the layer interfaces) of the u-faces - ! units: nondim - ! cell_methods: xq:point yh:mean zi:point - ! variants: {por_layer_widthU,por_layer_widthU_xyave} -"por_layer_widthV" [Unused] - ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2} - ! long_name: Porous barrier open width fraction (at the layer interfaces) of the v-faces - ! units: nondim - ! cell_methods: xh:mean yq:point zi:point - ! variants: {por_layer_widthV,por_layer_widthV_xyave} -"por_face_areaU" [Unused] - ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2} - ! long_name: Porous barrier open area fraction (layer averaged) of U-faces - ! units: nondim - ! cell_methods: xq:point yh:mean zl:mean - ! variants: {por_face_areaU,por_face_areaU_xyave} -"por_face_areaV" [Unused] - ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2} - ! long_name: Porous barrier open area fraction (layer averaged) of V-faces - ! units: nondim - ! cell_methods: xh:mean yq:point zl:mean - ! variants: {por_face_areaV,por_face_areaV_xyave} "RV" [Unused] ! modules: {ocean_model,ocean_model_d2} ! long_name: Relative Vorticity diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index b8086a20e..f240335cc 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -49,7 +49,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -748,23 +748,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. diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.short b/ocean_only/lock_exchange/MOM_parameter_doc.short index 13a3a1f16..eec2ff6c4 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.short +++ b/ocean_only/lock_exchange/MOM_parameter_doc.short @@ -230,8 +230,6 @@ KV_BBL_MIN = 1.0E-06 ! [m2 s-1] default = 1.0E-04 ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === ! === module MOM_continuity_PPM === diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all index d70c7bb93..8fbc0c6d4 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -858,23 +858,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. diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short index d49f174f0..368af6bf9 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short @@ -258,8 +258,6 @@ KV = 1.0E-04 ! [m2 s-1] KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 8079bcc80..f6ae48efd 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -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 @@ -857,19 +857,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_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. diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.short b/ocean_only/nonBous_global/MOM_parameter_doc.short index 58d271ca2..663f257be 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.short +++ b/ocean_only/nonBous_global/MOM_parameter_doc.short @@ -284,8 +284,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 === TIDES = True ! [Boolean] default = False ! If true, apply tidal momentum forcing. diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index 50d8ff8d9..65006fb90 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -49,7 +49,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -740,23 +740,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. diff --git a/ocean_only/resting/layer/MOM_parameter_doc.short b/ocean_only/resting/layer/MOM_parameter_doc.short index d27616ce9..541c7cdab 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.short +++ b/ocean_only/resting/layer/MOM_parameter_doc.short @@ -203,8 +203,6 @@ KV = 0.0 ! [m2 s-1] KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index c56e8c90f..e67158979 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -858,23 +858,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. diff --git a/ocean_only/resting/z/MOM_parameter_doc.short b/ocean_only/resting/z/MOM_parameter_doc.short index 3035ae72d..b686bc666 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.short +++ b/ocean_only/resting/z/MOM_parameter_doc.short @@ -217,8 +217,6 @@ KV = 0.0 ! [m2 s-1] KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 6caff36bc..610e9f6fa 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -49,7 +49,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -773,23 +773,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. diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.short b/ocean_only/seamount/layer/MOM_parameter_doc.short index 38660aeb7..6072edd38 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.short +++ b/ocean_only/seamount/layer/MOM_parameter_doc.short @@ -236,8 +236,6 @@ KV = 1.0E-04 ! [m2 s-1] KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index b46d82ceb..c92dd2d0e 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -937,23 +937,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. diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.short b/ocean_only/seamount/rho/MOM_parameter_doc.short index 9708e230a..91503ecd7 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.short +++ b/ocean_only/seamount/rho/MOM_parameter_doc.short @@ -284,8 +284,6 @@ KV = 1.0E-04 ! [m2 s-1] KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 75aa47323..7fca061e1 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -886,23 +886,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. diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.short b/ocean_only/seamount/sigma/MOM_parameter_doc.short index 2147d855c..571b20b00 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.short +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.short @@ -262,8 +262,6 @@ KV = 1.0E-04 ! [m2 s-1] KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index a3c633266..3d86c4260 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -886,23 +886,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. diff --git a/ocean_only/seamount/z/MOM_parameter_doc.short b/ocean_only/seamount/z/MOM_parameter_doc.short index b47030c46..df18061c7 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.short +++ b/ocean_only/seamount/z/MOM_parameter_doc.short @@ -262,8 +262,6 @@ KV = 1.0E-04 ! [m2 s-1] KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index 21f6d5b72..645852a7e 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -47,7 +47,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -765,23 +765,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.short b/ocean_only/single_column/BML/MOM_parameter_doc.short index c71c5b228..704205a27 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.short +++ b/ocean_only/single_column/BML/MOM_parameter_doc.short @@ -177,8 +177,6 @@ KV = 1.0E-04 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index e62bd327d..f112e60c3 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -56,7 +56,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -835,23 +835,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.short b/ocean_only/single_column/EPBL/MOM_parameter_doc.short index 092fe6a3b..ca65871ca 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.short +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.short @@ -187,8 +187,6 @@ KV = 1.0E-04 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index 8f4541599..648be0211 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -56,7 +56,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -835,23 +835,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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.short b/ocean_only/single_column/KPP/MOM_parameter_doc.short index 219e10c06..3743d3198 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.short +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.short @@ -187,8 +187,6 @@ KV = 1.0E-04 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_unsplit === ! === module MOM_continuity_PPM === diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index ef7d7a4f8..0df9157d6 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -49,7 +49,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -754,23 +754,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. diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.short b/ocean_only/sloshing/layer/MOM_parameter_doc.short index c837ecb87..a31dfa85a 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.short +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.short @@ -234,8 +234,6 @@ KV = 0.0 ! [m2 s-1] KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 2dc626941..e95c31b4d 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -920,23 +920,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. diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.short b/ocean_only/sloshing/rho/MOM_parameter_doc.short index 10d20485c..c36e83481 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.short +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.short @@ -282,8 +282,6 @@ KV = 0.0 ! [m2 s-1] KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 7a7babee5..de262174e 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -872,23 +872,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. diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.short b/ocean_only/sloshing/z/MOM_parameter_doc.short index 75ad3a5cf..31a9207fc 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.short +++ b/ocean_only/sloshing/z/MOM_parameter_doc.short @@ -260,8 +260,6 @@ KV = 0.0 ! [m2 s-1] KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === BE = 0.7 ! [nondim] default = 0.6 ! If SPLIT is true, BE determines the relative weighting of a 2nd-order diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index 02ec01231..993037724 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -49,7 +49,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -737,23 +737,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. diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.short b/ocean_only/torus_advection_test/MOM_parameter_doc.short index c3b1a51c6..52a470d38 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.short +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.short @@ -214,8 +214,6 @@ KV = 0.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === ! === module MOM_continuity_PPM === diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 305482042..0ce90bcc1 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -921,23 +921,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. diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short index a50541a41..4125d9813 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short @@ -260,8 +260,6 @@ KV = 1.0E-06 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === ! === module MOM_continuity_PPM === diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index bb0507422..4136dfe39 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -58,7 +58,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -873,23 +873,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. diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short index 289d54829..be7de524b 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short @@ -238,8 +238,6 @@ KV = 1.0E-06 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === module MOM_porous_barriers === - ! === module MOM_dynamics_split_RK2 === ! === module MOM_continuity_PPM === diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index c15b5ee9e..ecef0efc5 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -47,7 +47,7 @@ THICKNESSDIFFUSE = False ! [Boolean] default = False APPLY_INTERFACE_FILTER = False ! [Boolean] default = False ! If true, model interface heights are subjected to a grid-scale dependent ! spatial smoothing, often with biharmonic filter. -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 @@ -610,23 +610,6 @@ USE_GM_WORK_BUG = False ! [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 . -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_unsplit === UNSPLIT_DT_VISC_BUG = False ! [Boolean] default = False ! If false, use the correct timestep in the viscous terms applied in the first diff --git a/ocean_only/unit_tests/MOM_parameter_doc.short b/ocean_only/unit_tests/MOM_parameter_doc.short index d79cd0436..fb8d7d782 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.short +++ b/ocean_only/unit_tests/MOM_parameter_doc.short @@ -103,12 +103,6 @@ KV = 1.0 ! [m2 s-1] ! === module MOM_thickness_diffuse === -! === 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_unsplit === ! === module MOM_continuity_PPM === diff --git a/src/MOM6 b/src/MOM6 index df2cd1265..3d37f1332 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit df2cd1265006eb2e98cd9471a8f77c6d8a1c1135 +Subproject commit 3d37f13324fae35dea438940cb2570e0e763e055