From 0ec325c4c7a14af0e196c176bdb5997f549cb855 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 15 Sep 2016 09:47:51 -0400 Subject: [PATCH] MOM6: Merge branch 'ESMG-user/ksh/open_bc' into dev/master - 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 #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 --- .../CM2G63L/MOM_parameter_doc.all | 6 ++++ .../CM2G63L/MOM_parameter_doc.short | 1 + .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 6 ++++ .../MOM_parameter_doc.short | 1 + ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 6 ++++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.short | 1 + ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 6 ++++ .../OM4_025/MOM_parameter_doc.short | 1 + ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 6 ++++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short | 1 + ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 7 +++++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.short | 2 ++ .../SIS2_bergs_cgrid/MOM_parameter_doc.all | 7 +++++ .../SIS2_bergs_cgrid/MOM_parameter_doc.short | 2 ++ .../SIS2_cgrid/MOM_parameter_doc.all | 7 +++++ .../SIS2_cgrid/MOM_parameter_doc.short | 2 ++ .../OM_360x320_C180/MOM_parameter_doc.all | 6 ++++ .../OM_360x320_C180/MOM_parameter_doc.short | 1 + .../cooling_only/BML/MOM_parameter_doc.all | 7 +++++ .../cooling_only/BML/MOM_parameter_doc.short | 2 ++ .../cooling_only/EPBL/MOM_parameter_doc.all | 7 +++++ .../cooling_only/EPBL/MOM_parameter_doc.short | 2 ++ .../cooling_only/KPP/MOM_parameter_doc.all | 7 +++++ .../cooling_only/KPP/MOM_parameter_doc.short | 2 ++ .../mech_only/BML/MOM_parameter_doc.all | 7 +++++ .../mech_only/BML/MOM_parameter_doc.short | 2 ++ .../mech_only/EPBL/MOM_parameter_doc.all | 7 +++++ .../mech_only/EPBL/MOM_parameter_doc.short | 2 ++ .../mech_only/KPP/MOM_parameter_doc.all | 7 +++++ .../mech_only/KPP/MOM_parameter_doc.short | 2 ++ .../BML/MOM_parameter_doc.all | 7 +++++ .../BML/MOM_parameter_doc.short | 2 ++ .../EPBL/MOM_parameter_doc.all | 7 +++++ .../EPBL/MOM_parameter_doc.short | 2 ++ .../KPP/MOM_parameter_doc.all | 7 +++++ .../KPP/MOM_parameter_doc.short | 2 ++ .../wind_only/BML/MOM_parameter_doc.all | 7 +++++ .../wind_only/BML/MOM_parameter_doc.short | 2 ++ .../wind_only/EPBL/MOM_parameter_doc.all | 7 +++++ .../wind_only/EPBL/MOM_parameter_doc.short | 2 ++ .../wind_only/KPP/MOM_parameter_doc.all | 7 +++++ .../wind_only/KPP/MOM_parameter_doc.short | 2 ++ ocean_only/DOME/MOM_input | 5 ++- ocean_only/DOME/MOM_parameter_doc.all | 30 +++++------------- ocean_only/DOME/MOM_parameter_doc.short | 14 ++++----- .../Phillips_2layer/MOM_parameter_doc.all | 7 +++++ .../Phillips_2layer/MOM_parameter_doc.short | 3 ++ .../MOM_parameter_doc.all | 7 +++++ .../MOM_parameter_doc.short | 2 ++ .../adjustment2d/layer/MOM_parameter_doc.all | 7 +++++ .../layer/MOM_parameter_doc.short | 2 ++ .../adjustment2d/rho/MOM_parameter_doc.all | 7 +++++ .../adjustment2d/rho/MOM_parameter_doc.short | 2 ++ .../adjustment2d/z/MOM_parameter_doc.all | 7 +++++ .../adjustment2d/z/MOM_parameter_doc.short | 2 ++ ocean_only/benchmark/MOM_parameter_doc.all | 7 +++++ ocean_only/benchmark/MOM_parameter_doc.short | 2 ++ ocean_only/circle_obcs/MOM_input | 22 ++++++------- ocean_only/circle_obcs/MOM_parameter_doc.all | 31 ++++++++----------- .../circle_obcs/MOM_parameter_doc.short | 24 +++++++------- ocean_only/double_gyre/MOM_parameter_doc.all | 7 +++++ .../double_gyre/MOM_parameter_doc.short | 2 ++ .../external_gwave/MOM_parameter_doc.all | 7 +++++ .../external_gwave/MOM_parameter_doc.short | 2 ++ .../layer/MOM_parameter_doc.all | 7 +++++ .../layer/MOM_parameter_doc.short | 2 ++ .../flow_downslope/rho/MOM_parameter_doc.all | 7 +++++ .../rho/MOM_parameter_doc.short | 2 ++ .../sigma/MOM_parameter_doc.all | 7 +++++ .../sigma/MOM_parameter_doc.short | 2 ++ .../flow_downslope/z/MOM_parameter_doc.all | 7 +++++ .../flow_downslope/z/MOM_parameter_doc.short | 2 ++ .../global_ALE/hycom/MOM_parameter_doc.all | 6 ++++ .../global_ALE/hycom/MOM_parameter_doc.short | 1 + .../global_ALE/layer/MOM_parameter_doc.all | 6 ++++ .../global_ALE/layer/MOM_parameter_doc.short | 1 + ocean_only/global_ALE/z/MOM_parameter_doc.all | 6 ++++ .../global_ALE/z/MOM_parameter_doc.short | 1 + .../lock_exchange/MOM_parameter_doc.all | 7 +++++ .../lock_exchange/MOM_parameter_doc.short | 2 ++ .../MOM_parameter_doc.all | 7 +++++ .../MOM_parameter_doc.short | 3 ++ .../nonBous_global/MOM_parameter_doc.all | 7 +++++ .../nonBous_global/MOM_parameter_doc.short | 2 ++ .../resting/layer/MOM_parameter_doc.all | 7 +++++ .../resting/layer/MOM_parameter_doc.short | 2 ++ ocean_only/resting/z/MOM_parameter_doc.all | 7 +++++ ocean_only/resting/z/MOM_parameter_doc.short | 2 ++ .../seamount/layer/MOM_parameter_doc.all | 7 +++++ .../seamount/layer/MOM_parameter_doc.short | 2 ++ ocean_only/seamount/rho/MOM_parameter_doc.all | 7 +++++ .../seamount/rho/MOM_parameter_doc.short | 2 ++ .../seamount/sigma/MOM_parameter_doc.all | 7 +++++ .../seamount/sigma/MOM_parameter_doc.short | 2 ++ ocean_only/seamount/z/MOM_parameter_doc.all | 7 +++++ ocean_only/seamount/z/MOM_parameter_doc.short | 2 ++ .../single_column/BML/MOM_parameter_doc.all | 6 ++++ .../single_column/BML/MOM_parameter_doc.short | 1 + .../single_column/EPBL/MOM_parameter_doc.all | 6 ++++ .../EPBL/MOM_parameter_doc.short | 1 + .../single_column/KPP/MOM_parameter_doc.all | 6 ++++ .../single_column/KPP/MOM_parameter_doc.short | 1 + .../sloshing/layer/MOM_parameter_doc.all | 7 +++++ .../sloshing/layer/MOM_parameter_doc.short | 2 ++ ocean_only/sloshing/rho/MOM_parameter_doc.all | 7 +++++ .../sloshing/rho/MOM_parameter_doc.short | 2 ++ ocean_only/sloshing/z/MOM_parameter_doc.all | 7 +++++ ocean_only/sloshing/z/MOM_parameter_doc.short | 2 ++ .../MOM_parameter_doc.all | 7 +++++ .../MOM_parameter_doc.short | 3 ++ src/MOM6 | 2 +- 111 files changed, 500 insertions(+), 75 deletions(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index 2043cb3261..150a48eb37 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -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" @@ -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 @@ -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 diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short index 5a27162c4e..652fa7de17 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short @@ -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] 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 e107cec328..20fcc7f47f 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 @@ -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" @@ -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 @@ -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 diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short index e05befb3b9..fc04a5a244 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short @@ -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] diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index ab06e4bc56..46e346aaf1 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -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" @@ -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 @@ -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 diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short index 2e1473d3a5..7bce244537 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short @@ -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] diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 58888c8929..042eed089c 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -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" @@ -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 @@ -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 diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index cd8f08cae6..c5d23a7930 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -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" diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index cb94d6f4d4..6c9f2416dc 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -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" @@ -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 @@ -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 diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index 396c4772fc..fdd655c357 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -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" diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index b628038e0b..6398fefdd8 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -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" @@ -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 @@ -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" ! @@ -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 diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short index c5505494ab..51aedc6b2f 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short @@ -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] @@ -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" ! 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 785b737058..8536369e36 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -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" @@ -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 @@ -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" ! @@ -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 diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short index 1ec03f8da4..16069a1aac 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short @@ -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] @@ -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" ! diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 785b737058..8536369e36 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -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" @@ -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 @@ -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" ! @@ -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 diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short index 1ec03f8da4..16069a1aac 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short @@ -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] @@ -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" ! diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index c95f538391..17f97e2690 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -294,6 +294,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" @@ -312,12 +313,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 @@ -568,6 +573,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 diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short index 13ffac7ff4..9492c924bf 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short @@ -146,6 +146,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 = 6500.0 ! [m] diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all index 970ebfef2a..9971e9a6dd 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all @@ -283,6 +283,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -292,12 +293,16 @@ MAXIMUM_DEPTH = 400.0 ! [m] ! === 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 @@ -392,6 +397,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! @@ -430,6 +436,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 diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short index 4db60e142a..444730f2ee 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short @@ -102,6 +102,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -167,6 +168,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all index c00cce7a6d..63bf693ee2 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all @@ -285,6 +285,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -294,12 +295,16 @@ MAXIMUM_DEPTH = 400.0 ! [m] ! === 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 @@ -526,6 +531,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! @@ -564,6 +570,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 diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short index 6a7782e2ea..7775990ab7 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short @@ -105,6 +105,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -183,6 +184,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all index 720b6c5d92..f9ce7fca6f 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all @@ -285,6 +285,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -294,12 +295,16 @@ MAXIMUM_DEPTH = 400.0 ! [m] ! === 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 @@ -526,6 +531,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! @@ -564,6 +570,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 diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short index db5f7540f3..f1cc58c880 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short @@ -105,6 +105,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -183,6 +184,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all index f59d6ae107..2cead30b5a 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all @@ -283,6 +283,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -292,12 +293,16 @@ MAXIMUM_DEPTH = 400.0 ! [m] ! === 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 @@ -392,6 +397,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! @@ -430,6 +436,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 diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short index 50c932410b..d76ad2dfd1 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short @@ -102,6 +102,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -167,6 +168,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all index d7ca794de0..0e3555750e 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all @@ -285,6 +285,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -294,12 +295,16 @@ MAXIMUM_DEPTH = 400.0 ! [m] ! === 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 @@ -526,6 +531,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! @@ -564,6 +570,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 diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short index 9c05301e47..ce1027e87d 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short @@ -105,6 +105,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -183,6 +184,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all index c3b8be23b1..84bf08d3ec 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all @@ -285,6 +285,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -294,12 +295,16 @@ MAXIMUM_DEPTH = 400.0 ! [m] ! === 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 @@ -526,6 +531,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! @@ -564,6 +570,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 diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short index 43e92dcb03..22016501e0 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short @@ -105,6 +105,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -183,6 +184,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all index 3ba60e38f9..480373936e 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all @@ -283,6 +283,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -292,12 +293,16 @@ MAXIMUM_DEPTH = 400.0 ! [m] ! === 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 @@ -392,6 +397,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! @@ -430,6 +436,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 diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short index 4f075cb430..399bf45918 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short @@ -102,6 +102,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -167,6 +168,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all index d2286d8c8d..e84b318e79 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all @@ -285,6 +285,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -294,12 +295,16 @@ MAXIMUM_DEPTH = 400.0 ! [m] ! === 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 @@ -526,6 +531,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! @@ -564,6 +570,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 diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short index b017b53893..c8cb5e7b5e 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short @@ -105,6 +105,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -183,6 +184,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all index 529dd25615..83199ca3aa 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all @@ -285,6 +285,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -294,12 +295,16 @@ MAXIMUM_DEPTH = 400.0 ! [m] ! === 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 @@ -526,6 +531,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! @@ -564,6 +570,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 diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short index 8c4672edf4..a6e9d9913c 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short @@ -105,6 +105,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -183,6 +184,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all index 99699a4d08..8adba735cb 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all @@ -283,6 +283,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -292,12 +293,16 @@ MAXIMUM_DEPTH = 400.0 ! [m] ! === 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 @@ -392,6 +397,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! @@ -430,6 +436,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 diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short index 58cc4cddd2..cd506431f8 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short @@ -102,6 +102,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -167,6 +168,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all index 2f5c407f77..fe37b4238c 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all @@ -285,6 +285,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -294,12 +295,16 @@ MAXIMUM_DEPTH = 400.0 ! [m] ! === 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 @@ -526,6 +531,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! @@ -564,6 +570,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 diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short index 83c2580b53..2bad6b5eee 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short @@ -105,6 +105,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -183,6 +184,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all index 40fd169365..ba6c32142b 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all @@ -285,6 +285,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -294,12 +295,16 @@ MAXIMUM_DEPTH = 400.0 ! [m] ! === 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 @@ -526,6 +531,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! @@ -564,6 +570,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 diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short index 8870df9fe2..c70b16cabf 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short @@ -105,6 +105,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -183,6 +184,7 @@ THICKNESS_CONFIG = "coord" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! diff --git a/ocean_only/DOME/MOM_input b/ocean_only/DOME/MOM_input index f28ed19d32..7613757f8a 100644 --- a/ocean_only/DOME/MOM_input +++ b/ocean_only/DOME/MOM_input @@ -205,9 +205,8 @@ SPONGE_CONFIG = "DOME" ! default = "file" ! USER - call a user modified routine. !Total sponge columns = 2400 ! ! The total number of columns where sponges are applied. -APPLY_OBC_V = True ! [Boolean] default = False - ! If true, open boundary conditions may be set at some - ! v-points, with the configuration controlled by OBC_CONFIG +OBC_NUMBER_OF_SEGMENTS = 1 +OBC_SEGMENT_001 = "J=N,I=110:100,SIMPLE" OBC_CONFIG = "DOME" ! default = "file" ! A string that sets how the open boundary conditions are ! configured: diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 90cf8be9ca..166b9aaefe 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -245,6 +245,7 @@ TOPO_CONFIG = "DOME" ! ! 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. @@ -256,30 +257,13 @@ MAXIMUM_DEPTH = 3600.0 ! [m] ! === module MOM_open_boundary === ! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -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 = True ! [Boolean] default = False - ! If true, open boundary conditions may be set at some - ! v-points, with the configuration controlled by OBC_CONFIG -APPLY_OBC_U_FLATHER_EAST = False ! [Boolean] default = False - ! Apply a Flather open boundary condition on the eastern - ! side of the global domain -APPLY_OBC_U_FLATHER_WEST = False ! [Boolean] default = False - ! Apply a Flather open boundary condition on the western - ! side of the global domain -APPLY_OBC_V_FLATHER_NORTH = False ! [Boolean] default = False - ! Apply a Flather open boundary condition on the northern - ! side of the global domain -APPLY_OBC_V_FLATHER_SOUTH = False ! [Boolean] default = False - ! Apply a Flather open boundary condition on the southern - ! side of the global domain -OBC_CONFIG = "DOME" ! default = "file" +OBC_NUMBER_OF_SEGMENTS = 1 ! default = 0 + ! The number of open boundary segments. +OBC_SEGMENT_001 = "J=N,I=110:100,SIMPLE" ! + ! Documentation needs to be dynamic????? +OBC_CONFIG = "DOME" ! default = "none" ! A string that sets how the open boundary conditions are ! configured: - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! USER - call a user modified routine. MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 ! The depth below which to mask points as land points, for which all ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. @@ -361,6 +345,7 @@ THICKNESS_CONFIG = "DOME" ! ! 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. VELOCITY_CONFIG = "zero" ! default = "zero" @@ -372,6 +357,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 diff --git a/ocean_only/DOME/MOM_parameter_doc.short b/ocean_only/DOME/MOM_parameter_doc.short index c96df65b7a..1fb65387bd 100644 --- a/ocean_only/DOME/MOM_parameter_doc.short +++ b/ocean_only/DOME/MOM_parameter_doc.short @@ -110,6 +110,7 @@ TOPO_CONFIG = "DOME" ! ! 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. @@ -121,15 +122,13 @@ MAXIMUM_DEPTH = 3600.0 ! [m] ! === module MOM_open_boundary === ! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -APPLY_OBC_V = True ! [Boolean] default = False - ! If true, open boundary conditions may be set at some - ! v-points, with the configuration controlled by OBC_CONFIG -OBC_CONFIG = "DOME" ! default = "file" +OBC_NUMBER_OF_SEGMENTS = 1 ! default = 0 + ! The number of open boundary segments. +OBC_SEGMENT_001 = "J=N,I=110:100,SIMPLE" ! + ! Documentation needs to be dynamic????? +OBC_CONFIG = "DOME" ! default = "none" ! A string that sets how the open boundary conditions are ! configured: - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! USER - call a user modified routine. ROTATION = "beta" ! default = "2omegasinlat" ! This specifies how the Coriolis parameter is specified: ! 2omegasinlat - Use twice the planetary rotation rate @@ -186,6 +185,7 @@ THICKNESS_CONFIG = "DOME" ! ! 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. SPONGE_CONFIG = "DOME" ! default = "file" diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index b49d89818c..dfee0bd641 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -235,6 +235,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 1.0 ! [m] default = 0.0 @@ -244,12 +245,16 @@ MAXIMUM_DEPTH = 2000.0 ! [m] ! === 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 @@ -341,6 +346,7 @@ THICKNESS_CONFIG = "phillips" ! ! 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. HALF_STRAT_DEPTH = 0.25 ! [nondim] default = 0.5 @@ -359,6 +365,7 @@ VELOCITY_CONFIG = "phillips" ! 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. VELOCITY_IC_PERTURB_AMP = 0.001 ! [m s-1] default = 0.001 ! The magnitude of the initial velocity perturbation. diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.short b/ocean_only/Phillips_2layer/MOM_parameter_doc.short index 7ba5ed6d3e..6ce05611ad 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.short +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.short @@ -105,6 +105,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 1.0 ! [m] default = 0.0 @@ -173,6 +174,7 @@ THICKNESS_CONFIG = "phillips" ! ! 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. HALF_STRAT_DEPTH = 0.25 ! [nondim] default = 0.5 @@ -191,6 +193,7 @@ VELOCITY_CONFIG = "phillips" ! 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. SPONGE = True ! [Boolean] default = False ! If true, sponges may be applied anywhere in the domain. diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 963895f428..8d943204cf 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -285,6 +285,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -294,12 +295,16 @@ MAXIMUM_DEPTH = 300.0 ! [m] ! === 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 @@ -526,6 +531,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! @@ -564,6 +570,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 diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short index 0dad77e536..e733e1f147 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short @@ -111,6 +111,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -189,6 +190,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "SCM_ideal_hurr" ! diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index e8dd5692d7..2b202a1506 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.1 ! [m] default = 0.0 @@ -302,12 +303,16 @@ MAXIMUM_DEPTH = 20.0 ! [m] ! === 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 @@ -403,6 +408,7 @@ THICKNESS_CONFIG = "adjustment2d" ! ! 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. MIN_THICKNESS = 1.0E-04 ! [m] default = 0.001 @@ -455,6 +461,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 diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short index 27d97c3608..5d6c9ff88c 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short @@ -127,6 +127,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.1 ! [m] default = 0.0 @@ -190,6 +191,7 @@ THICKNESS_CONFIG = "adjustment2d" ! ! 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. MIN_THICKNESS = 1.0E-04 ! [m] default = 0.001 diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 63ca38277a..8b588cea48 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.1 ! [m] default = 0.0 @@ -302,12 +303,16 @@ MAXIMUM_DEPTH = 20.0 ! [m] ! === 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 @@ -538,6 +543,7 @@ THICKNESS_CONFIG = "adjustment2d" ! ! 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. ADJUSTMENT_WIDTH = 0.01 ! [same as x,y] @@ -588,6 +594,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 diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short index 411142f80f..356a5c52b9 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short @@ -123,6 +123,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.1 ! [m] default = 0.0 @@ -236,6 +237,7 @@ THICKNESS_CONFIG = "adjustment2d" ! ! 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. ADJUSTMENT_WIDTH = 0.01 ! [same as x,y] diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 34d13a6109..5f0b12b67a 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.1 ! [m] default = 0.0 @@ -302,12 +303,16 @@ MAXIMUM_DEPTH = 20.0 ! [m] ! === 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 @@ -542,6 +547,7 @@ THICKNESS_CONFIG = "adjustment2d" ! ! 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. ADJUSTMENT_WIDTH = 0.01 ! [same as x,y] @@ -592,6 +598,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 diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.short b/ocean_only/adjustment2d/z/MOM_parameter_doc.short index 6bfd98c924..d09296689a 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.short @@ -123,6 +123,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.1 ! [m] default = 0.0 @@ -236,6 +237,7 @@ THICKNESS_CONFIG = "adjustment2d" ! ! 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. ADJUSTMENT_WIDTH = 0.01 ! [same as x,y] diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 20cdf37361..0a1bb1a648 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -317,6 +317,7 @@ TOPO_CONFIG = "benchmark" ! ! 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. @@ -328,12 +329,16 @@ MAXIMUM_DEPTH = 5500.0 ! [m] ! === 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 @@ -440,6 +445,7 @@ THICKNESS_CONFIG = "benchmark" ! ! 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. TS_CONFIG = "benchmark" ! @@ -470,6 +476,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 diff --git a/ocean_only/benchmark/MOM_parameter_doc.short b/ocean_only/benchmark/MOM_parameter_doc.short index 167c549395..6d073f5fdf 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.short +++ b/ocean_only/benchmark/MOM_parameter_doc.short @@ -118,6 +118,7 @@ TOPO_CONFIG = "benchmark" ! ! 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. @@ -185,6 +186,7 @@ THICKNESS_CONFIG = "benchmark" ! ! 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. TS_CONFIG = "benchmark" ! diff --git a/ocean_only/circle_obcs/MOM_input b/ocean_only/circle_obcs/MOM_input index b968326ef7..2d498d6e16 100644 --- a/ocean_only/circle_obcs/MOM_input +++ b/ocean_only/circle_obcs/MOM_input @@ -159,18 +159,16 @@ MINIMUM_DEPTH = 1.0 ! [m] default = 0.0 ! The minimum depth of the ocean. MAXIMUM_DEPTH = 600.0 ! [m] ! The maximum depth of the ocean. -APPLY_OBC_U_FLATHER_EAST = True ! [Boolean] default = False - ! Apply a Flather open boundary condition on the eastern - ! side of the global domain -APPLY_OBC_U_FLATHER_WEST = True ! [Boolean] default = False - ! Apply a Flather open boundary condition on the western - ! side of the global domain -APPLY_OBC_V_FLATHER_NORTH = True ! [Boolean] default = False - ! Apply a Flather open boundary condition on the northern - ! side of the global domain -APPLY_OBC_V_FLATHER_SOUTH = True ! [Boolean] default = False - ! Apply a Flather open boundary condition on the southern - ! side of the global domain +OBC_NUMBER_OF_SEGMENTS = 4 +OBC_SEGMENT_001 = "J=N,I=N:0,FLATHER,ORLANSKI" +OBC_SEGMENT_002 = "J=0,I=0:N,FLATHER,ORLANSKI" +OBC_SEGMENT_003 = "I=N,J=0:N,FLATHER,ORLANSKI" +OBC_SEGMENT_004 = "I=0,J=N:0,FLATHER,ORLANSKI" +OBC_CONFIG = "None" ! default = "None" + ! A string that sets how the open boundary conditions are + ! configured: + ! USER - call a user modified routine. + ROTATION = "beta" ! default = "2omegasinlat" ! This specifies how the Coriolis parameter is specified: ! 2omegasinlat - Use twice the planetary rotation rate diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 9b59002cbd..c6979e6681 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -245,6 +245,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 1.0 ! [m] default = 0.0 @@ -254,24 +255,16 @@ MAXIMUM_DEPTH = 600.0 ! [m] ! === module MOM_open_boundary === ! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -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 -APPLY_OBC_U_FLATHER_EAST = True ! [Boolean] default = False - ! Apply a Flather open boundary condition on the eastern - ! side of the global domain -APPLY_OBC_U_FLATHER_WEST = True ! [Boolean] default = False - ! Apply a Flather open boundary condition on the western - ! side of the global domain -APPLY_OBC_V_FLATHER_NORTH = True ! [Boolean] default = False - ! Apply a Flather open boundary condition on the northern - ! side of the global domain -APPLY_OBC_V_FLATHER_SOUTH = True ! [Boolean] default = False - ! Apply a Flather open boundary condition on the southern - ! side of the global domain +OBC_NUMBER_OF_SEGMENTS = 4 ! default = 0 + ! The number of open boundary segments. +OBC_SEGMENT_001 = "J=N,I=N:0,FLATHER,ORLANSKI" ! + ! Documentation needs to be dynamic????? +OBC_SEGMENT_002 = "J=0,I=0:N,FLATHER,ORLANSKI" ! + ! Documentation needs to be dynamic????? +OBC_SEGMENT_003 = "I=N,J=0:N,FLATHER,ORLANSKI" ! + ! Documentation needs to be dynamic????? +OBC_SEGMENT_004 = "I=0,J=N:0,FLATHER,ORLANSKI" ! + ! Documentation needs to be dynamic????? MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 ! The depth below which to mask points as land points, for which all ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. @@ -353,6 +346,7 @@ THICKNESS_CONFIG = "circle_obcs" ! ! 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. @@ -369,6 +363,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 diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.short b/ocean_only/circle_obcs/MOM_parameter_doc.short index cde8139b29..9e81270742 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.short +++ b/ocean_only/circle_obcs/MOM_parameter_doc.short @@ -101,6 +101,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 1.0 ! [m] default = 0.0 @@ -110,18 +111,16 @@ MAXIMUM_DEPTH = 600.0 ! [m] ! === module MOM_open_boundary === ! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -APPLY_OBC_U_FLATHER_EAST = True ! [Boolean] default = False - ! Apply a Flather open boundary condition on the eastern - ! side of the global domain -APPLY_OBC_U_FLATHER_WEST = True ! [Boolean] default = False - ! Apply a Flather open boundary condition on the western - ! side of the global domain -APPLY_OBC_V_FLATHER_NORTH = True ! [Boolean] default = False - ! Apply a Flather open boundary condition on the northern - ! side of the global domain -APPLY_OBC_V_FLATHER_SOUTH = True ! [Boolean] default = False - ! Apply a Flather open boundary condition on the southern - ! side of the global domain +OBC_NUMBER_OF_SEGMENTS = 4 ! default = 0 + ! The number of open boundary segments. +OBC_SEGMENT_001 = "J=N,I=N:0,FLATHER,ORLANSKI" ! + ! Documentation needs to be dynamic????? +OBC_SEGMENT_002 = "J=0,I=0:N,FLATHER,ORLANSKI" ! + ! Documentation needs to be dynamic????? +OBC_SEGMENT_003 = "I=N,J=0:N,FLATHER,ORLANSKI" ! + ! Documentation needs to be dynamic????? +OBC_SEGMENT_004 = "I=0,J=N:0,FLATHER,ORLANSKI" ! + ! Documentation needs to be dynamic????? ROTATION = "beta" ! default = "2omegasinlat" ! This specifies how the Coriolis parameter is specified: ! 2omegasinlat - Use twice the planetary rotation rate @@ -175,6 +174,7 @@ THICKNESS_CONFIG = "circle_obcs" ! ! 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. diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 47a5b1f851..f0714d6fe3 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -228,6 +228,7 @@ TOPO_CONFIG = "spoon" ! ! 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. MINIMUM_DEPTH = 1.0 ! [m] default = 0.0 @@ -242,12 +243,16 @@ MAXIMUM_DEPTH = 2000.0 ! [m] ! === 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 @@ -335,6 +340,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. VELOCITY_CONFIG = "zero" ! default = "zero" @@ -346,6 +352,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 diff --git a/ocean_only/double_gyre/MOM_parameter_doc.short b/ocean_only/double_gyre/MOM_parameter_doc.short index b6d97c8d1e..04b93396fc 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.short +++ b/ocean_only/double_gyre/MOM_parameter_doc.short @@ -93,6 +93,7 @@ TOPO_CONFIG = "spoon" ! ! 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. MINIMUM_DEPTH = 1.0 ! [m] default = 0.0 @@ -151,6 +152,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 5df1cfca03..e586f546f3 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.01 ! [m] default = 0.0 @@ -302,12 +303,16 @@ MAXIMUM_DEPTH = 20.0 ! [m] ! === 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 @@ -401,6 +406,7 @@ THICKNESS_CONFIG = "external_gwave" ! ! 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. SSH_ANOMALY_HEIGHT = 1.0 ! [m] @@ -442,6 +448,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 diff --git a/ocean_only/external_gwave/MOM_parameter_doc.short b/ocean_only/external_gwave/MOM_parameter_doc.short index 98acb0af1d..6c7c3d68ac 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.short +++ b/ocean_only/external_gwave/MOM_parameter_doc.short @@ -120,6 +120,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.01 ! [m] default = 0.0 @@ -184,6 +185,7 @@ THICKNESS_CONFIG = "external_gwave" ! ! 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. SSH_ANOMALY_HEIGHT = 1.0 ! [m] diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 1e2d160107..130c0d34b7 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "DOME2D" ! ! 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. DOME2D_SHELF_WIDTH = 0.1 ! [nondim] default = 0.1 @@ -311,12 +312,16 @@ MINIMUM_DEPTH = 1.0 ! [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 @@ -412,6 +417,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! 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. TS_CONFIG = "DOME2D" ! @@ -450,6 +456,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 diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short index b3ff4aeedd..a6b3a24256 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short @@ -116,6 +116,7 @@ TOPO_CONFIG = "DOME2D" ! ! 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 = 4000.0 ! [m] @@ -184,6 +185,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! 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. TS_CONFIG = "DOME2D" ! diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index 2affa9aba6..864443c407 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "DOME2D" ! ! 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. DOME2D_SHELF_WIDTH = 0.1 ! [nondim] default = 0.1 @@ -311,12 +312,16 @@ MINIMUM_DEPTH = 1.0 ! [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 @@ -547,6 +552,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! 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. TS_CONFIG = "DOME2D" ! @@ -585,6 +591,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 diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short index 95d8d4c21f..1e983a1aad 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short @@ -112,6 +112,7 @@ TOPO_CONFIG = "DOME2D" ! ! 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 = 4000.0 ! [m] @@ -230,6 +231,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! 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. TS_CONFIG = "DOME2D" ! diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index e9f6de9cd0..f8ef6ecd6d 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "DOME2D" ! ! 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. DOME2D_SHELF_WIDTH = 0.1 ! [nondim] default = 0.1 @@ -311,12 +312,16 @@ MINIMUM_DEPTH = 1.0 ! [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 @@ -547,6 +552,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! 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. TS_CONFIG = "DOME2D" ! @@ -585,6 +591,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 diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short index a20f61b449..c9ebbc5d69 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short @@ -112,6 +112,7 @@ TOPO_CONFIG = "DOME2D" ! ! 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 = 4000.0 ! [m] @@ -227,6 +228,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! 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. TS_CONFIG = "DOME2D" ! diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index d4f5568c4d..b352d8f4fa 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "DOME2D" ! ! 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. DOME2D_SHELF_WIDTH = 0.1 ! [nondim] default = 0.1 @@ -311,12 +312,16 @@ MINIMUM_DEPTH = 1.0 ! [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 @@ -551,6 +556,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! 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. TS_CONFIG = "DOME2D" ! @@ -589,6 +595,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 diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.short b/ocean_only/flow_downslope/z/MOM_parameter_doc.short index 02a73e5068..ddeb85bdf5 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.short @@ -112,6 +112,7 @@ TOPO_CONFIG = "DOME2D" ! ! 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 = 4000.0 ! [m] @@ -227,6 +228,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! 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. TS_CONFIG = "DOME2D" ! diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 09c59cef1a..313f4b8acf 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -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 = "topog.nc" ! default = "topog.nc" @@ -324,12 +325,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 @@ -575,6 +580,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 diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short index 65ef4d14eb..125e5a5df5 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short @@ -127,6 +127,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] diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 172c1a44bc..c3fe4c09aa 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -304,6 +304,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" @@ -322,12 +323,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 @@ -443,6 +448,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 diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.short b/ocean_only/global_ALE/layer/MOM_parameter_doc.short index ff311f3338..8dce12d856 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.short @@ -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] diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index b0552f9a1a..1b9949a27c 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -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 = "topog.nc" ! default = "topog.nc" @@ -324,12 +325,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 @@ -575,6 +580,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 diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.short b/ocean_only/global_ALE/z/MOM_parameter_doc.short index f9e40b75e0..da12bcb8a0 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.short @@ -127,6 +127,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] diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 9662ef38d4..676d7da5cf 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.01 ! [m] default = 0.0 @@ -302,12 +303,16 @@ MAXIMUM_DEPTH = 20.0 ! [m] ! === 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 @@ -401,6 +406,7 @@ THICKNESS_CONFIG = "lock_exchange" ! ! 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. FRONT_DISPLACEMENT = 20.0 ! [m] @@ -445,6 +451,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 diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.short b/ocean_only/lock_exchange/MOM_parameter_doc.short index ae5b6f1793..4e1a4fbd8e 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.short +++ b/ocean_only/lock_exchange/MOM_parameter_doc.short @@ -113,6 +113,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.01 ! [m] default = 0.0 @@ -177,6 +178,7 @@ THICKNESS_CONFIG = "lock_exchange" ! ! 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. FRONT_DISPLACEMENT = 20.0 ! [m] 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 4a35fa73ce..bb3b6e95eb 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 1.0 ! [m] default = 0.0 @@ -302,12 +303,16 @@ MAXIMUM_DEPTH = 400.0 ! [m] ! === 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 @@ -542,6 +547,7 @@ THICKNESS_CONFIG = "rossby_front" ! ! 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. T_RANGE = 5.0 ! [C] default = 0.0 @@ -578,6 +584,7 @@ VELOCITY_CONFIG = "rossby_front" ! 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 diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short index d810ce28fb..00dd16519f 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short @@ -95,6 +95,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 1.0 ! [m] default = 0.0 @@ -186,6 +187,7 @@ THICKNESS_CONFIG = "rossby_front" ! ! 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. T_RANGE = 5.0 ! [C] default = 0.0 @@ -222,6 +224,7 @@ VELOCITY_CONFIG = "rossby_front" ! 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. ! === module MOM_diag_mediator === diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 40f9ec7956..5dfb458a0b 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -292,6 +292,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" @@ -310,12 +311,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 @@ -406,6 +411,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" ! @@ -450,6 +456,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 = True ! [Boolean] default = False ! If true, convert the thickness initial conditions from diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.short b/ocean_only/nonBous_global/MOM_parameter_doc.short index 93d76a486b..11c5342413 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.short +++ b/ocean_only/nonBous_global/MOM_parameter_doc.short @@ -122,6 +122,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] @@ -192,6 +193,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" ! diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index d0845ac790..d5fab85f5c 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 1.0 ! [m] default = 0.0 @@ -302,12 +303,16 @@ MAXIMUM_DEPTH = 1000.0 ! [m] ! === 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 @@ -403,6 +408,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "linear" ! @@ -441,6 +447,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 diff --git a/ocean_only/resting/layer/MOM_parameter_doc.short b/ocean_only/resting/layer/MOM_parameter_doc.short index 5e8b5a5756..8fe291ae8d 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.short +++ b/ocean_only/resting/layer/MOM_parameter_doc.short @@ -107,6 +107,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 1.0 ! [m] default = 0.0 @@ -172,6 +173,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "linear" ! diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 144298b417..e22aa442db 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 1.0 ! [m] default = 0.0 @@ -302,12 +303,16 @@ MAXIMUM_DEPTH = 1000.0 ! [m] ! === 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 @@ -542,6 +547,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "linear" ! @@ -580,6 +586,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 diff --git a/ocean_only/resting/z/MOM_parameter_doc.short b/ocean_only/resting/z/MOM_parameter_doc.short index 6087fe0ab5..2220e952ca 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.short +++ b/ocean_only/resting/z/MOM_parameter_doc.short @@ -103,6 +103,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 1.0 ! [m] default = 0.0 @@ -199,6 +200,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "linear" ! diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index dc15e42813..bd66996b27 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "seamount" ! ! 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. SEAMOUNT_DELTA = 0.5 ! [non-dim] default = 0.5 @@ -313,12 +314,16 @@ MINIMUM_DEPTH = 1.0 ! [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 @@ -429,6 +434,7 @@ THICKNESS_CONFIG = "seamount" ! ! 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. MIN_THICKNESS = 0.1 ! [m] default = 0.001 @@ -472,6 +478,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 diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.short b/ocean_only/seamount/layer/MOM_parameter_doc.short index ce6bc8dda3..d45e2d4553 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.short +++ b/ocean_only/seamount/layer/MOM_parameter_doc.short @@ -109,6 +109,7 @@ TOPO_CONFIG = "seamount" ! ! 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 = 4000.0 ! [m] @@ -182,6 +183,7 @@ THICKNESS_CONFIG = "seamount" ! ! 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. MIN_THICKNESS = 0.1 ! [m] default = 0.001 diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 45631d698e..5ff8e15b4f 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "seamount" ! ! 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. SEAMOUNT_DELTA = 0.5 ! [non-dim] default = 0.5 @@ -313,12 +314,16 @@ MINIMUM_DEPTH = 1.0 ! [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 @@ -564,6 +569,7 @@ THICKNESS_CONFIG = "seamount" ! ! 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. TS_CONFIG = "seamount" ! @@ -605,6 +611,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 diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.short b/ocean_only/seamount/rho/MOM_parameter_doc.short index 98fc5fd5a6..ae94636537 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.short +++ b/ocean_only/seamount/rho/MOM_parameter_doc.short @@ -105,6 +105,7 @@ TOPO_CONFIG = "seamount" ! ! 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 = 4000.0 ! [m] @@ -228,6 +229,7 @@ THICKNESS_CONFIG = "seamount" ! ! 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. TS_CONFIG = "seamount" ! diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 11655e7e4d..0630f1eaa6 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "seamount" ! ! 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. SEAMOUNT_DELTA = 0.5 ! [non-dim] default = 0.5 @@ -313,12 +314,16 @@ MINIMUM_DEPTH = 1.0 ! [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 @@ -564,6 +569,7 @@ THICKNESS_CONFIG = "seamount" ! ! 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. TS_CONFIG = "seamount" ! @@ -605,6 +611,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 diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.short b/ocean_only/seamount/sigma/MOM_parameter_doc.short index 2078996439..120e20f574 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.short +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.short @@ -105,6 +105,7 @@ TOPO_CONFIG = "seamount" ! ! 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 = 4000.0 ! [m] @@ -228,6 +229,7 @@ THICKNESS_CONFIG = "seamount" ! ! 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. TS_CONFIG = "seamount" ! diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index ec2661aaa1..d84c2e2077 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "seamount" ! ! 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. SEAMOUNT_DELTA = 0.5 ! [non-dim] default = 0.5 @@ -313,12 +314,16 @@ MINIMUM_DEPTH = 1.0 ! [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 @@ -568,6 +573,7 @@ THICKNESS_CONFIG = "seamount" ! ! 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. TS_CONFIG = "seamount" ! @@ -609,6 +615,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 diff --git a/ocean_only/seamount/z/MOM_parameter_doc.short b/ocean_only/seamount/z/MOM_parameter_doc.short index 8eaa66c599..5e09cf2d69 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.short +++ b/ocean_only/seamount/z/MOM_parameter_doc.short @@ -105,6 +105,7 @@ TOPO_CONFIG = "seamount" ! ! 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 = 4000.0 ! [m] @@ -228,6 +229,7 @@ THICKNESS_CONFIG = "seamount" ! ! 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. TS_CONFIG = "seamount" ! diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index f7186eb9f3..48e911a133 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -272,6 +272,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -281,12 +282,16 @@ MAXIMUM_DEPTH = 6000.0 ! [m] ! === 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 @@ -406,6 +411,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 diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.short b/ocean_only/single_column/BML/MOM_parameter_doc.short index 4ae056c704..a40c9c2952 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.short +++ b/ocean_only/single_column/BML/MOM_parameter_doc.short @@ -94,6 +94,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index af939e048d..af772b0402 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -274,6 +274,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -283,12 +284,16 @@ MAXIMUM_DEPTH = 6000.0 ! [m] ! === 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 @@ -531,6 +536,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 diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.short b/ocean_only/single_column/EPBL/MOM_parameter_doc.short index 5e600fa3bf..a5c0983e56 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.short +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.short @@ -97,6 +97,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index 98ca631051..659aa1b6de 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -274,6 +274,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 @@ -283,12 +284,16 @@ MAXIMUM_DEPTH = 6000.0 ! [m] ! === 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 @@ -531,6 +536,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 diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.short b/ocean_only/single_column/KPP/MOM_parameter_doc.short index 059a48449b..0e1a10306c 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.short +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.short @@ -97,6 +97,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 3e66709b49..a229ada82c 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "sloshing" ! ! 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 = 1000.0 ! [m] @@ -305,12 +306,16 @@ MINIMUM_DEPTH = 1.0 ! [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 @@ -406,6 +411,7 @@ THICKNESS_CONFIG = "sloshing" ! ! 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. TS_CONFIG = "sloshing" ! @@ -444,6 +450,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 diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.short b/ocean_only/sloshing/layer/MOM_parameter_doc.short index f9ff44d5f9..0e93376cbb 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.short +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.short @@ -107,6 +107,7 @@ TOPO_CONFIG = "sloshing" ! ! 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 = 1000.0 ! [m] @@ -175,6 +176,7 @@ THICKNESS_CONFIG = "sloshing" ! ! 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. TS_CONFIG = "sloshing" ! diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index daaaef6f1f..1ff6a74720 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "sloshing" ! ! 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 = 1000.0 ! [m] @@ -305,12 +306,16 @@ MINIMUM_DEPTH = 1.0 ! [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 @@ -541,6 +546,7 @@ THICKNESS_CONFIG = "sloshing" ! ! 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. TS_CONFIG = "sloshing" ! @@ -579,6 +585,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 diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.short b/ocean_only/sloshing/rho/MOM_parameter_doc.short index d5aae06281..0d530e7bde 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.short +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.short @@ -103,6 +103,7 @@ TOPO_CONFIG = "sloshing" ! ! 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 = 1000.0 ! [m] @@ -218,6 +219,7 @@ THICKNESS_CONFIG = "sloshing" ! ! 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. TS_CONFIG = "sloshing" ! diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 9bba3540d6..1e6812bb5d 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -293,6 +293,7 @@ TOPO_CONFIG = "sloshing" ! ! 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 = 1000.0 ! [m] @@ -305,12 +306,16 @@ MINIMUM_DEPTH = 1.0 ! [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 @@ -545,6 +550,7 @@ THICKNESS_CONFIG = "sloshing" ! ! 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. TS_CONFIG = "sloshing" ! @@ -583,6 +589,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 diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.short b/ocean_only/sloshing/z/MOM_parameter_doc.short index 0bf6d7847d..7747125def 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.short +++ b/ocean_only/sloshing/z/MOM_parameter_doc.short @@ -103,6 +103,7 @@ TOPO_CONFIG = "sloshing" ! ! 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 = 1000.0 ! [m] @@ -218,6 +219,7 @@ THICKNESS_CONFIG = "sloshing" ! ! 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. TS_CONFIG = "sloshing" ! diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index 5d44c9b752..ff7ee35bdd 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -313,6 +313,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.01 ! [m] default = 0.0 @@ -322,12 +323,16 @@ MAXIMUM_DEPTH = 200.0 ! [m] ! === 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 @@ -423,6 +428,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "fit" ! @@ -456,6 +462,7 @@ VELOCITY_CONFIG = "uniform" ! 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. INITIAL_U_CONST = 0.2 ! [m s-1] ! A initial uniform value for the zonal flow. diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.short b/ocean_only/torus_advection_test/MOM_parameter_doc.short index ebdac19d5b..f3a6d8d1b2 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.short +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.short @@ -127,6 +127,7 @@ TOPO_CONFIG = "flat" ! ! 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. MINIMUM_DEPTH = 0.01 ! [m] default = 0.0 @@ -191,6 +192,7 @@ THICKNESS_CONFIG = "uniform" ! ! 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. TS_CONFIG = "fit" ! @@ -221,6 +223,7 @@ VELOCITY_CONFIG = "uniform" ! 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. INITIAL_U_CONST = 0.2 ! [m s-1] ! A initial uniform value for the zonal flow. diff --git a/src/MOM6 b/src/MOM6 index 36275aed47..2bc939b8c6 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 36275aed478d21de3c9051cf7155a2a0a50ea2b7 +Subproject commit 2bc939b8c67ce3ae07bef43452d1e114605c7e44