Skip to content

Commit

Permalink
MOM6: Ice-shelf solo driver and MISMIP+ updates (NOAA-GFDL#471)
Browse files Browse the repository at this point in the history
- NOAA-GFDL/MOM6@ac66061e1 Ice-shelf solo driver and MISMIP+ updates (NOAA-GFDL#471)
- NOAA-GFDL/MOM6@475590dbc Acceleration of Zanna-Bolton-2020 parameterization and new features required for NW2 (#484)
- NOAA-GFDL/MOM6@43a4fa9d4 Refactor diapyc_energy_req_calc and find_PE_chg
- NOAA-GFDL/MOM6@ead68d498 +Refactored diapyc_energy_req_test
- NOAA-GFDL/MOM6@0c491ce12 +REMAP_AUX needs at least one more halo update. (#496)
- NOAA-GFDL/MOM6@89506fab0 Ice shelf Coulomb friction law (NOAA-GFDL#470)
  • Loading branch information
mom6bot authored and marshallward committed Oct 23, 2023
1 parent a1c1d4f commit 23825de
Show file tree
Hide file tree
Showing 16 changed files with 31 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ REDO_FAST_ICE_UPDATE = False ! [Boolean] default = False
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.
NCAT_ICE = 5 ! [nondim] default = 5
! The number of sea ice thickness categories.
NK_ICE = 4 ! [nondim] default = 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ REDO_FAST_ICE_UPDATE = True ! [Boolean] default = True
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.

! === module MOM_domains ===
REENTRANT_X = True ! [Boolean] default = True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ REDO_FAST_ICE_UPDATE = True ! [Boolean] default = True
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.
NCAT_ICE = 5 ! [nondim] default = 5
! The number of sea ice thickness categories.
NK_ICE = 4 ! [nondim] default = 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ REDO_FAST_ICE_UPDATE = True ! [Boolean] default = True
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.

! === module MOM_domains ===
REENTRANT_X = True ! [Boolean] default = True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ REDO_FAST_ICE_UPDATE = True ! [Boolean] default = True
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.
NCAT_ICE = 5 ! [nondim] default = 5
! The number of sea ice thickness categories.
NK_ICE = 4 ! [nondim] default = 4
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 @@ -88,6 +88,8 @@ REDO_FAST_ICE_UPDATE = False ! [Boolean] default = False
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.
NCAT_ICE = 5 ! [nondim] default = 5
! The number of sea ice thickness categories.
NK_ICE = 4 ! [nondim] default = 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ REDO_FAST_ICE_UPDATE = False ! [Boolean] default = False
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.
NCAT_ICE = 5 ! [nondim] default = 5
! The number of sea ice thickness categories.
NK_ICE = 4 ! [nondim] default = 4
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 @@ -88,6 +88,8 @@ REDO_FAST_ICE_UPDATE = False ! [Boolean] default = False
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.
NCAT_ICE = 5 ! [nondim] default = 5
! The number of sea ice thickness categories.
NK_ICE = 4 ! [nondim] default = 4
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 @@ -88,6 +88,8 @@ REDO_FAST_ICE_UPDATE = False ! [Boolean] default = False
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.
NCAT_ICE = 5 ! [nondim] default = 5
! The number of sea ice thickness categories.
NK_ICE = 4 ! [nondim] default = 4
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 @@ -90,6 +90,8 @@ REDO_FAST_ICE_UPDATE = False ! [Boolean] default = False
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.
NCAT_ICE = 5 ! [nondim] default = 5
! The number of sea ice thickness categories.
NK_ICE = 4 ! [nondim] default = 4
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 @@ -90,6 +90,8 @@ REDO_FAST_ICE_UPDATE = False ! [Boolean] default = False
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.
NCAT_ICE = 5 ! [nondim] default = 5
! The number of sea ice thickness categories.
NK_ICE = 4 ! [nondim] default = 4
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 @@ -90,6 +90,8 @@ REDO_FAST_ICE_UPDATE = False ! [Boolean] default = False
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.
NCAT_ICE = 5 ! [nondim] default = 5
! The number of sea ice thickness categories.
NK_ICE = 4 ! [nondim] default = 4
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/SIS2/SIS_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ REDO_FAST_ICE_UPDATE = False ! [Boolean] default = False
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.
NCAT_ICE = 5 ! [nondim] default = 5
! The number of sea ice thickness categories.
NK_ICE = 4 ! [nondim] default = 4
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 @@ -90,6 +90,8 @@ REDO_FAST_ICE_UPDATE = False ! [Boolean] default = False
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.
NCAT_ICE = 5 ! [nondim] default = 5
! The number of sea ice thickness categories.
NK_ICE = 4 ! [nondim] default = 4
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 @@ -88,6 +88,8 @@ REDO_FAST_ICE_UPDATE = False ! [Boolean] default = False
! If true, recalculate the thermal updates from the fast dynamics on the slowly
! evolving ice state, rather than copying over the slow ice state to the fast
! ice state.
READ_HLIM_VALS = False ! [Boolean] default = False
! If true, read the lower limits on the ice thicknesscategories.
NCAT_ICE = 5 ! [nondim] default = 5
! The number of sea ice thickness categories.
NK_ICE = 4 ! [nondim] default = 4
Expand Down

0 comments on commit 23825de

Please sign in to comment.