Skip to content

Commit

Permalink
MOM6: Frequency-dependent internal wave drag (#815)
Browse files Browse the repository at this point in the history 
- 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
  • Loading branch information
@mom6bot @Hallberg-NOAA
mom6bot authored and Hallberg-NOAA committed Feb 17, 2025
1 parent bb20f90 commit e31614d
Show file tree
Hide file tree
Showing 45 changed files with 133 additions and 1 deletion.
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/DOME/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/Phillips_2layer/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/adjustment2d/layer/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/adjustment2d/rho/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/adjustment2d/z/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/benchmark/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/circle_obcs/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/double_gyre/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/external_gwave/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/flow_downslope/layer/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading

0 comments on commit e31614d

Please sign in to comment.