Skip to content

Tide support #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adcroft merged 2 commits into from
Nov 15, 2017
Merged

Tide support #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22eb9a9
MOM6: +Made 4 commits to support barotropic tides
Hallberg-NOAA Nov 13, 2017
ac58394
MOM6: Made 4 commits to support barotropic tides
Hallberg-NOAA Nov 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,6 +1067,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
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 & _vdivided by the depth of
! the ocean. This was introduced to facilitate tide modeling.
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
Expand Down
4 changes: 4 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
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 & _vdivided by the depth of
! the ocean. This was introduced to facilitate tide modeling.
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
Expand Down
4 changes: 4 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
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 & _vdivided by the depth of
! the ocean. This was introduced to facilitate tide modeling.
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
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
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 & _vdivided by the depth of
! the ocean. This was introduced to facilitate tide modeling.
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
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,6 +1275,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
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 & _vdivided by the depth of
! the ocean. This was introduced to facilitate tide modeling.
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
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,6 +1290,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
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 & _vdivided by the depth of
! the ocean. This was introduced to facilitate tide modeling.
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
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,6 +1293,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
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 & _vdivided by the depth of
! the ocean. This was introduced to facilitate tide modeling.
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
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ THICKNESS_CONFIG = "file" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down Expand Up @@ -1077,6 +1078,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
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 & _vdivided by the depth of
! the ocean. This was introduced to facilitate tide modeling.
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
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ THICKNESS_CONFIG = "file" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ THICKNESS_CONFIG = "file" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down Expand Up @@ -1077,6 +1078,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
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 & _vdivided by the depth of
! the ocean. This was introduced to facilitate tide modeling.
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
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ THICKNESS_CONFIG = "file" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ THICKNESS_CONFIG = "file" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down Expand Up @@ -1077,6 +1078,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
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 & _vdivided by the depth of
! the ocean. This was introduced to facilitate tide modeling.
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
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ THICKNESS_CONFIG = "file" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down
4 changes: 4 additions & 0 deletions land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,6 +1204,10 @@ BT_STRONG_DRAG = True ! [Boolean] default = False
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
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 & _vdivided by the depth of
! the ocean. This was introduced to facilitate tide modeling.
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
Expand Down
1 change: 1 addition & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ THICKNESS_CONFIG = "uniform" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down
1 change: 1 addition & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ THICKNESS_CONFIG = "uniform" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down
1 change: 1 addition & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ THICKNESS_CONFIG = "coord" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down
1 change: 1 addition & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ THICKNESS_CONFIG = "coord" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down
1 change: 1 addition & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ THICKNESS_CONFIG = "coord" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down
1 change: 1 addition & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ THICKNESS_CONFIG = "coord" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down
1 change: 1 addition & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ THICKNESS_CONFIG = "uniform" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down
1 change: 1 addition & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ THICKNESS_CONFIG = "uniform" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down
1 change: 1 addition & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ THICKNESS_CONFIG = "coord" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down
1 change: 1 addition & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ THICKNESS_CONFIG = "coord" !
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
! list - read a list of positive interface depths.
! DOME - use a slope and channel configuration for the
! DOME sill-overflow test case.
! ISOMIP - use a configuration for the
Expand Down
Loading