Skip to content

Commit

Permalink
MOM6: Merge branch 'ESMG-user/ksh/open_bc' into dev/master
Browse files Browse the repository at this point in the history 
- Updated MOM_input in circle_obcs and DOME to use SEGMENTS protocol.
- Updates MOM_parameters_docs with new topography/initialization configurations available.
- No answer changes.

- NOAA-GFDL/MOM6@2bc939b Merge branch 'ESMG-user/ksh/open_bc' into dev/master
- NOAA-GFDL/MOM6@f288b1a Merge pull request mom-ocean#15 from adcroft/project/obc_segment_fixes
- NOAA-GFDL/MOM6@fcdb84e Fixes needed to "not" extend OBCs beyond domain.
- NOAA-GFDL/MOM6@0aef287 Fixed extract_word() for n>number of words
- NOAA-GFDL/MOM6@4a23711 Merge branch 'user/ksh/open_bc' into project/obc_segment_fixes
  • Loading branch information
@adcroft
adcroft committed Sep 15, 2016
1 parent 15d7971 commit 0ec325c
Show file tree
Hide file tree
Showing 111 changed files with 500 additions and 75 deletions.
6 changes: 6 additions & 0 deletions coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
TOPO_FILE = "topog.nc" ! default = "topog.nc"
Expand All @@ -361,12 +362,16 @@ MINIMUM_DEPTH = 0.5 ! [m] default = 0.0

! === module MOM_open_boundary ===
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any.
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
! The number of open boundary segments.
APPLY_OBC_U = False ! [Boolean] default = False
! If true, open boundary conditions may be set at some
! u-points, with the configuration controlled by OBC_CONFIG
APPLY_OBC_V = False ! [Boolean] default = False
! If true, open boundary conditions may be set at some
! v-points, with the configuration controlled by OBC_CONFIG
OBC_CONFIG = "file" ! default = "file"
! If set, open boundary configuration string
APPLY_OBC_U_FLATHER_EAST = False ! [Boolean] default = False
! Apply a Flather open boundary condition on the eastern
! side of the global domain
Expand Down Expand Up @@ -482,6 +487,7 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! uniform - the flow is uniform (determined by
! parameters INITIAL_U_CONST and INITIAL_V_CONST).
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from
Expand Down
1 change: 1 addition & 0 deletions coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
MAXIMUM_DEPTH = 6000.0 ! [m]
Expand Down
6 changes: 6 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 @@ -343,6 +343,7 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
TOPO_FILE = "topog.nc" ! default = "topog.nc"
Expand All @@ -361,12 +362,16 @@ MINIMUM_DEPTH = 0.5 ! [m] default = 0.0

! === module MOM_open_boundary ===
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any.
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
! The number of open boundary segments.
APPLY_OBC_U = False ! [Boolean] default = False
! If true, open boundary conditions may be set at some
! u-points, with the configuration controlled by OBC_CONFIG
APPLY_OBC_V = False ! [Boolean] default = False
! If true, open boundary conditions may be set at some
! v-points, with the configuration controlled by OBC_CONFIG
OBC_CONFIG = "file" ! default = "file"
! If set, open boundary configuration string
APPLY_OBC_U_FLATHER_EAST = False ! [Boolean] default = False
! Apply a Flather open boundary condition on the eastern
! side of the global domain
Expand Down Expand Up @@ -482,6 +487,7 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! uniform - the flow is uniform (determined by
! parameters INITIAL_U_CONST and INITIAL_V_CONST).
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from
Expand Down
1 change: 1 addition & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
MAXIMUM_DEPTH = 6000.0 ! [m]
Expand Down
6 changes: 6 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 @@ -343,6 +343,7 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
TOPO_FILE = "topog.nc" ! default = "topog.nc"
Expand All @@ -361,12 +362,16 @@ MINIMUM_DEPTH = 0.5 ! [m] default = 0.0

! === module MOM_open_boundary ===
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any.
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
! The number of open boundary segments.
APPLY_OBC_U = False ! [Boolean] default = False
! If true, open boundary conditions may be set at some
! u-points, with the configuration controlled by OBC_CONFIG
APPLY_OBC_V = False ! [Boolean] default = False
! If true, open boundary conditions may be set at some
! v-points, with the configuration controlled by OBC_CONFIG
OBC_CONFIG = "file" ! default = "file"
! If set, open boundary configuration string
APPLY_OBC_U_FLATHER_EAST = False ! [Boolean] default = False
! Apply a Flather open boundary condition on the eastern
! side of the global domain
Expand Down Expand Up @@ -482,6 +487,7 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! uniform - the flow is uniform (determined by
! parameters INITIAL_U_CONST and INITIAL_V_CONST).
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
MAXIMUM_DEPTH = 6000.0 ! [m]
Expand Down
6 changes: 6 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 @@ -306,6 +306,7 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
TOPO_FILE = "ocean_topog.nc" ! default = "topog.nc"
Expand All @@ -324,12 +325,16 @@ MINIMUM_DEPTH = 9.5 ! [m] default = 0.0

! === module MOM_open_boundary ===
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any.
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
! The number of open boundary segments.
APPLY_OBC_U = False ! [Boolean] default = False
! If true, open boundary conditions may be set at some
! u-points, with the configuration controlled by OBC_CONFIG
APPLY_OBC_V = False ! [Boolean] default = False
! If true, open boundary conditions may be set at some
! v-points, with the configuration controlled by OBC_CONFIG
OBC_CONFIG = "file" ! default = "file"
! If set, open boundary configuration string
APPLY_OBC_U_FLATHER_EAST = False ! [Boolean] default = False
! Apply a Flather open boundary condition on the eastern
! side of the global domain
Expand Down Expand Up @@ -578,6 +583,7 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! uniform - the flow is uniform (determined by
! parameters INITIAL_U_CONST and INITIAL_V_CONST).
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
TOPO_FILE = "ocean_topog.nc" ! default = "topog.nc"
Expand Down
6 changes: 6 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 @@ -306,6 +306,7 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
TOPO_FILE = "ocean_topog.nc" ! default = "topog.nc"
Expand All @@ -324,12 +325,16 @@ MINIMUM_DEPTH = 9.5 ! [m] default = 0.0

! === module MOM_open_boundary ===
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any.
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
! The number of open boundary segments.
APPLY_OBC_U = False ! [Boolean] default = False
! If true, open boundary conditions may be set at some
! u-points, with the configuration controlled by OBC_CONFIG
APPLY_OBC_V = False ! [Boolean] default = False
! If true, open boundary conditions may be set at some
! v-points, with the configuration controlled by OBC_CONFIG
OBC_CONFIG = "file" ! default = "file"
! If set, open boundary configuration string
APPLY_OBC_U_FLATHER_EAST = False ! [Boolean] default = False
! Apply a Flather open boundary condition on the eastern
! side of the global domain
Expand Down Expand Up @@ -582,6 +587,7 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! uniform - the flow is uniform (determined by
! parameters INITIAL_U_CONST and INITIAL_V_CONST).
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
TOPO_FILE = "ocean_topog.nc" ! default = "topog.nc"
Expand Down
7 changes: 7 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 @@ -343,6 +343,7 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
TOPO_FILE = "topog.nc" ! default = "topog.nc"
Expand All @@ -361,12 +362,16 @@ MINIMUM_DEPTH = 0.5 ! [m] default = 0.0

! === module MOM_open_boundary ===
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any.
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
! The number of open boundary segments.
APPLY_OBC_U = False ! [Boolean] default = False
! If true, open boundary conditions may be set at some
! u-points, with the configuration controlled by OBC_CONFIG
APPLY_OBC_V = False ! [Boolean] default = False
! If true, open boundary conditions may be set at some
! v-points, with the configuration controlled by OBC_CONFIG
OBC_CONFIG = "file" ! default = "file"
! If set, open boundary configuration string
APPLY_OBC_U_FLATHER_EAST = False ! [Boolean] default = False
! Apply a Flather open boundary condition on the eastern
! side of the global domain
Expand Down Expand Up @@ -457,6 +462,7 @@ THICKNESS_CONFIG = "file" !
! adjustment2d - TBD AJA.
! sloshing - TBD AJA.
! seamount - TBD AJA.
! soliton - Equatorial Rossby soliton.
! rossby_front - a mixed layer front in thermal wind balance.
! USER - call a user modified routine.
THICKNESS_FILE = "GOLD_IC.2010.11.15.nc" !
Expand Down Expand Up @@ -501,6 +507,7 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! uniform - the flow is uniform (determined by
! parameters INITIAL_U_CONST and INITIAL_V_CONST).
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
MAXIMUM_DEPTH = 6000.0 ! [m]
Expand Down Expand Up @@ -194,6 +195,7 @@ THICKNESS_CONFIG = "file" !
! adjustment2d - TBD AJA.
! sloshing - TBD AJA.
! seamount - TBD AJA.
! soliton - Equatorial Rossby soliton.
! rossby_front - a mixed layer front in thermal wind balance.
! USER - call a user modified routine.
THICKNESS_FILE = "GOLD_IC.2010.11.15.nc" !
Expand Down
Loading

0 comments on commit 0ec325c

Please sign in to comment.