diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all index 433c95447a..8ed544531f 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all @@ -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 diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.all index 79c04be184..af8922320c 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.all @@ -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 diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.all index 8ef620fe10..716554411c 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.all @@ -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 diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_fast_parameter_doc.all b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_fast_parameter_doc.all index 79c04be184..af8922320c 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_fast_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_fast_parameter_doc.all @@ -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 diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_parameter_doc.all b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_parameter_doc.all index 6d7f6bc9bd..da6b3875bd 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all index 57af32919a..8ce6134695 100644 --- a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.all b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.all index eb2820377e..f9e6373acf 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all index d84dc7b73e..d4619ddd8e 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all index 434d6e4a0b..0540c91bd4 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all index 51cb7dd6b8..f3c549bf74 100644 --- a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all index 7b8267480f..d923d3b1a4 100644 --- a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.all index 8f533b1983..3ea98389bd 100644 --- a/ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all index dda33f2205..68e53c4a3c 100644 --- a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all index 73680a1934..2ddd23a7a0 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all index 4dd309e1e1..89e622c80e 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all @@ -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 diff --git a/src/MOM6 b/src/MOM6 index 38aeccd855..ac66061e14 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 38aeccd855350d29bf88e210ba01b6e61cb600ac +Subproject commit ac66061e14a670b0112f1790b53046fcca4a9276