Skip to content

Commit

Permalink
SIS2: +Add landfast ice parameterization
Browse files Browse the repository at this point in the history
  This series of commits to SIS2 adds the option to use a landfast ice
parameterization with C-grid versions of the SIS2 code, and it fixes one issue
with restarting with a particular initialization mode.  The new landfast ice
option is enabled with the new runtime parameter LEMIEUX_LANDFAST. By default
there are no changes to answers, but there are new entries in SIS_parameter_doc
files.  The version of SIS2 used by MOM6-examples and the SIS_parameter_doc.all
files were updated.  The commits in this PR include:

- NOAA-GFDL/SIS2@6d47c6c Merge pull request #136 from ESMG/dev/esmg
- NOAA-GFDL/SIS2@97992d0 Fix restart problem with latitude initialization.
- NOAA-GFDL/SIS2@057cf2c Added missing abs functions.
- NOAA-GFDL/SIS2@091eff1 Fix a comment
- NOAA-GFDL/SIS2@7be9038 Still fussing with landfast ice.
- NOAA-GFDL/SIS2@20e679b Fix an omission.
- NOAA-GFDL/SIS2@69d0011 Stab at adding the Lemieux landfast ice option.
- NOAA-GFDL/SIS2@b0200fd Fix that Liz needed for restarts.
- NOAA-GFDL/SIS2@d6fd875 Fix to tracer advection.
- NOAA-GFDL/SIS2@76dbcbb +Added TRACER_ADV_REFILL_MASSLESS option
  • Loading branch information
Hallberg-NOAA committed Mar 4, 2021
1 parent 3ff35ef commit afa08fe
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,8 @@ CFL_TRUNCATE = 0.5 ! [nondim] default = 0.5
CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the rheology solver;
! otherwise only the final velocities that are used for transport are checked.
LEMIEUX_LANDFAST = False ! [Boolean] default = False
! If true, turn on Lemieux landfast ice parameterization.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness categories after
! advection.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,8 @@ CFL_TRUNCATE = 0.5 ! [nondim] default = 0.5
CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the rheology solver;
! otherwise only the final velocities that are used for transport are checked.
LEMIEUX_LANDFAST = False ! [Boolean] default = False
! If true, turn on Lemieux landfast ice parameterization.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness categories after
! advection.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,8 @@ CFL_TRUNCATE = 0.5 ! [nondim] default = 0.5
CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the rheology solver;
! otherwise only the final velocities that are used for transport are checked.
LEMIEUX_LANDFAST = False ! [Boolean] default = False
! If true, turn on Lemieux landfast ice parameterization.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness categories after
! advection.
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic/SIS_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,8 @@ CFL_TRUNCATE = 0.5 ! [nondim] default = 0.5
CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the rheology solver;
! otherwise only the final velocities that are used for transport are checked.
LEMIEUX_LANDFAST = False ! [Boolean] default = False
! If true, turn on Lemieux landfast ice parameterization.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness categories after
! advection.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,8 @@ CFL_TRUNCATE = 0.5 ! [nondim] default = 0.5
CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the rheology solver;
! otherwise only the final velocities that are used for transport are checked.
LEMIEUX_LANDFAST = False ! [Boolean] default = False
! If true, turn on Lemieux landfast ice parameterization.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness categories after
! advection.
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,8 @@ CFL_TRUNCATE = 0.5 ! [nondim] default = 0.5
CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the rheology solver;
! otherwise only the final velocities that are used for transport are checked.
LEMIEUX_LANDFAST = False ! [Boolean] default = False
! If true, turn on Lemieux landfast ice parameterization.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness categories after
! advection.
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,8 @@ CFL_TRUNCATE = 0.5 ! [nondim] default = 0.5
CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the rheology solver;
! otherwise only the final velocities that are used for transport are checked.
LEMIEUX_LANDFAST = False ! [Boolean] default = False
! If true, turn on Lemieux landfast ice parameterization.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness categories after
! advection.
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,8 @@ CFL_TRUNCATE = 0.5 ! [nondim] default = 0.5
CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the rheology solver;
! otherwise only the final velocities that are used for transport are checked.
LEMIEUX_LANDFAST = False ! [Boolean] default = False
! If true, turn on Lemieux landfast ice parameterization.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness categories after
! advection.
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,8 @@ CFL_TRUNCATE = 0.5 ! [nondim] default = 0.5
CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the rheology solver;
! otherwise only the final velocities that are used for transport are checked.
LEMIEUX_LANDFAST = False ! [Boolean] default = False
! If true, turn on Lemieux landfast ice parameterization.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness categories after
! advection.
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,8 @@ CFL_TRUNCATE = 0.5 ! [nondim] default = 0.5
CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the rheology solver;
! otherwise only the final velocities that are used for transport are checked.
LEMIEUX_LANDFAST = False ! [Boolean] default = False
! If true, turn on Lemieux landfast ice parameterization.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness categories after
! advection.
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,8 @@ CFL_TRUNCATE = 0.5 ! [nondim] default = 0.5
CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the rheology solver;
! otherwise only the final velocities that are used for transport are checked.
LEMIEUX_LANDFAST = False ! [Boolean] default = False
! If true, turn on Lemieux landfast ice parameterization.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness categories after
! advection.
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,8 @@ CFL_TRUNCATE = 0.5 ! [nondim] default = 0.5
CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the rheology solver;
! otherwise only the final velocities that are used for transport are checked.
LEMIEUX_LANDFAST = False ! [Boolean] default = False
! If true, turn on Lemieux landfast ice parameterization.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness categories after
! advection.
Expand Down
2 changes: 1 addition & 1 deletion src/SIS2

0 comments on commit afa08fe

Please sign in to comment.