diff --git a/CICE_SRC b/CICE_SRC index a2dc77db..33111b25 160000 --- a/CICE_SRC +++ b/CICE_SRC @@ -1 +1 @@ -Subproject commit a2dc77db2ff6e17aa6659b495e7aa05d31275dcd +Subproject commit 33111b257e9f22b2991333931ed16931d0d45217 diff --git a/parm/MOM_input_template b/parm/MOM_input_template index 00bb2c9f..afc5e9ec 100644 --- a/parm/MOM_input_template +++ b/parm/MOM_input_template @@ -151,6 +151,62 @@ MINIMUM_DEPTH = 9.5 ! [m] default = 0.0 ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. ! If MASKING_DEPTH is specified, then all depths shallower than ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. +THICKNESS_CONFIG = "file" ! + ! A string that determines how the initial layer + ! thicknesses are specified for a new run: + ! file - read interface heights from the file specified + ! thickness_file - read thicknesses from the file specified + ! by (THICKNESS_FILE). + ! coord - determined by ALE coordinate. + ! uniform - uniform thickness layers evenly distributed + ! between the surface and MAXIMUM_DEPTH. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! benchmark - use the benchmark test case thicknesses. + ! search - search a density profile for the interface + ! densities. This is not yet implemented. + ! circle_obcs - the circle_obcs test case is used. + ! DOME2D - 2D version of DOME initialization. + ! adjustment2d - TBD AJA. + ! sloshing - TBD AJA. + ! seamount - TBD AJA. + ! rossby_front - a mixed layer front in thermal wind balance. + ! USER - call a user modified routine. +THICKNESS_FILE = "MOM6.mx050.res.nc" ! + ! The name of the thickness file. +TS_CONFIG = "file" ! + ! A string that determines how the initial tempertures + ! and salinities are specified for a new run: + ! file - read velocities from the file specified + ! by (TS_FILE). + ! fit - find the temperatures that are consistent with + ! the layer densities and salinity S_REF. + ! TS_profile - use temperature and salinity profiles + ! (read from TS_FILE) to set layer densities. + ! benchmark - use the benchmark test case T & S. + ! linear - linear in logical layer space. + ! DOME2D - 2D DOME initialization. + ! adjustment2d - TBD AJA. + ! sloshing - TBD AJA. + ! seamount - TBD AJA. + ! rossby_front - a mixed layer front in thermal wind balance. + ! SCM_ideal_hurr - used in the SCM idealized hurricane test. + ! USER - call a user modified routine. +TS_FILE = "MOM6.mx050.res.nc" ! + ! The initial condition file for temperature. +VELOCITY_CONFIG = "file" ! + ! A string that determines how the initial velocities + ! are specified for a new run: + ! file - read velocities from the file specified + ! by (VELOCITY_FILE). + ! zero - the fluid is initially at rest. + ! 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.", default="zero" +VELOCITY_FILE = "MOM6.mx050.res.nc" ! + ! The initial condition file for velocities. GRID_ROTATION_ANGLE_BUGS = False ! [Boolean] default = True ! If true, use an older algorithm to calculate the sine and ! cosines needed rotate between grid-oriented directions and