From e31614db5b4e152e8d5ec36ede72993c05e076d2 Mon Sep 17 00:00:00 2001 From: MOM6 bot Date: Sun, 16 Feb 2025 18:27:09 -0500 Subject: [PATCH] MOM6: Frequency-dependent internal wave drag (#815) - NOAA-GFDL/MOM6@3b3fb5ea4 Frequency-dependent internal wave drag (#815) - NOAA-GFDL/MOM6@93067d084 Dimensional rescaling in MOM_state_stats - NOAA-GFDL/MOM6@c69f59edf +Find fluxes%netFWGlobalAdj in recsaled units MOM6: MurmurHash3 implementation --- coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 3 +++ coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all | 3 +++ .../Intersperse_ice_1deg/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 3 +++ .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 3 +++ ocean_only/DOME/MOM_parameter_doc.all | 3 +++ ocean_only/Phillips_2layer/MOM_parameter_doc.all | 3 +++ ocean_only/adjustment2d/layer/MOM_parameter_doc.all | 3 +++ ocean_only/adjustment2d/rho/MOM_parameter_doc.all | 3 +++ ocean_only/adjustment2d/z/MOM_parameter_doc.all | 3 +++ ocean_only/benchmark/MOM_parameter_doc.all | 3 +++ ocean_only/circle_obcs/MOM_parameter_doc.all | 3 +++ ocean_only/double_gyre/MOM_parameter_doc.all | 3 +++ ocean_only/external_gwave/MOM_parameter_doc.all | 3 +++ ocean_only/flow_downslope/layer/MOM_parameter_doc.all | 3 +++ ocean_only/flow_downslope/rho/MOM_parameter_doc.all | 3 +++ ocean_only/flow_downslope/sigma/MOM_parameter_doc.all | 3 +++ ocean_only/flow_downslope/z/MOM_parameter_doc.all | 3 +++ ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 3 +++ ocean_only/global_ALE/layer/MOM_parameter_doc.all | 3 +++ ocean_only/global_ALE/z/MOM_parameter_doc.all | 3 +++ ocean_only/lock_exchange/MOM_parameter_doc.all | 3 +++ ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all | 3 +++ ocean_only/nonBous_global/MOM_parameter_doc.all | 3 +++ ocean_only/resting/layer/MOM_parameter_doc.all | 3 +++ ocean_only/resting/z/MOM_parameter_doc.all | 3 +++ ocean_only/seamount/layer/MOM_parameter_doc.all | 3 +++ ocean_only/seamount/rho/MOM_parameter_doc.all | 3 +++ ocean_only/seamount/sigma/MOM_parameter_doc.all | 3 +++ ocean_only/seamount/z/MOM_parameter_doc.all | 3 +++ ocean_only/sloshing/layer/MOM_parameter_doc.all | 3 +++ ocean_only/sloshing/rho/MOM_parameter_doc.all | 3 +++ ocean_only/sloshing/z/MOM_parameter_doc.all | 3 +++ ocean_only/torus_advection_test/MOM_parameter_doc.all | 3 +++ ocean_only/tracer_mixing/rho/MOM_parameter_doc.all | 3 +++ ocean_only/tracer_mixing/z/MOM_parameter_doc.all | 3 +++ src/MOM6 | 2 +- 45 files changed, 133 insertions(+), 1 deletion(-) 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 0ff676de4..a939dcb5b 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 @@ -1379,6 +1379,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. 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 efabe635c..543e7db06 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 @@ -1379,6 +1379,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. 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 42655c8a2..09654fec6 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 @@ -1379,6 +1379,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 289b4cb98..fc25d7cf5 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1379,6 +1379,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. 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 1a7406dfc..4a8e2972e 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 @@ -1655,6 +1655,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. 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 2c15eb04b..3b7a11257 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -1652,6 +1652,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. 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 f953a9a0e..b5a50c699 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -1671,6 +1671,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index ee43693bb..0b1ccb202 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1652,6 +1652,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index a80e3bcfa..865f03b7d 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1671,6 +1671,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index a560f093c..5b8475f46 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -1642,6 +1642,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 39a7e7dcb..a0b93003b 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1346,6 +1346,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. 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 7b6bbca01..c22255df8 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1346,6 +1346,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 0da6335e8..4da469d7d 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1346,6 +1346,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 0317fce5c..f076eed5b 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -1156,6 +1156,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index a39ed98cc..f27a21d30 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -1085,6 +1085,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 21a8a4934..0f2cff0ad 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -1169,6 +1169,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index f5554497e..368cc4902 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -1333,6 +1333,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 21e2296ab..e4e5700d7 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -1285,6 +1285,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 42124f7f8..c5e7a1450 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -1256,6 +1256,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index da1a99df5..95f5b3b17 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -1236,6 +1236,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index ec4478229..411587876 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -1047,6 +1047,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 324e35643..3f715577b 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -1155,6 +1155,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 57dd77bc5..18a81623a 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -1166,6 +1166,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index 4f1c807d1..cbf4a3640 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -1332,6 +1332,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 6b9afe72b..8882b812f 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -1284,6 +1284,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index e90833405..3a57897aa 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -1284,6 +1284,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index b83b84595..d0727aff5 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1705,6 +1705,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index e8c68b76a..d5cdfe0c3 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1580,6 +1580,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 1981578a1..24ee46d8a 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1652,6 +1652,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 1d9ff4022..28df6890f 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -1158,6 +1158,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. 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 1665fcf54..be0203139 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -1269,6 +1269,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index a97fbd903..ca81f66fe 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1389,6 +1389,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index 894f4c6ef..5658bc9b1 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -1151,6 +1151,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index ac5819da4..738b1a509 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -1269,6 +1269,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 4ef9eef65..8dbf10195 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -1184,6 +1184,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index e1a52af7c..d3f2c8385 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -1348,6 +1348,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 216c84780..d229b288a 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -1297,6 +1297,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index b9f1474ca..b3efe2641 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -1297,6 +1297,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index d03caa489..6f5a39151 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -1167,6 +1167,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index f2352b48c..fc61fe648 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -1333,6 +1333,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index c2fab3dbf..6f4179be1 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -1285,6 +1285,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index c3886c4fb..381ea5169 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -1150,6 +1150,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 52b7301de..807e44877 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -1334,6 +1334,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index 8d0f9c51d..4c175bff6 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -1286,6 +1286,9 @@ BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False ! If true, apply a linear drag to the barotropic velocities, using rates set by ! lin_drag_u & _v divided by the depth of the ocean. This was introduced to ! facilitate tide modeling. +BT_LINEAR_FREQ_DRAG = False ! [Boolean] default = False + ! If true, apply frequency-dependent drag to the tidal velocities. The streaming + ! band-pass filter must be turned on. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed CFL_TRUNCATE. This should ! only be used as a desperate debugging measure. diff --git a/src/MOM6 b/src/MOM6 index 075f8b3fa..3b3fb5ea4 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 075f8b3fa03a6efd87eeb771e9fdd07c14f59539 +Subproject commit 3b3fb5ea4593a16dbb926c1cd886006f9cc8ebc7