Skip to content

Commit

Permalink
SIS2: Merge pull request #121 from Hallberg-NOAA/transmute_ice
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/SIS2@3318410 Merge pull request #121 from Hallberg-NOAA/transmute_ice
- NOAA-GFDL/SIS2@d1c5abb +Corrected descriptions of TRANSMUTE_SEA_ICE
- NOAA-GFDL/SIS2@d5e7883 +Added TRANSMUTE_ICE option
- NOAA-GFDL/SIS2@acc8a6c +Corrected description of ICE_THICKNESS_INIT_CONFIG
  • Loading branch information
@marshallward
marshallward committed Jun 10, 2020
1 parent a0178e9 commit 379c245
Show file tree
Hide file tree
Showing 14 changed files with 110 additions and 81 deletions.
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,9 @@ DO_ICE_RESTORE = False ! [Boolean] default = False
! If true, restore the sea ice state toward climatology.
NUDGE_SEA_ICE = False ! [Boolean] default = False
! If true, constrain the sea ice concentrations using observations.
TRANSMUTE_SEA_ICE = False ! [Boolean] default = False
! If true, allow ice to be transmuted directly into seawater with a spatially
! varying rate as a form of outflow open boundary condition.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,9 @@ DO_ICE_RESTORE = False ! [Boolean] default = False
! If true, restore the sea ice state toward climatology.
NUDGE_SEA_ICE = False ! [Boolean] default = False
! If true, constrain the sea ice concentrations using observations.
TRANSMUTE_SEA_ICE = False ! [Boolean] default = False
! If true, allow ice to be transmuted directly into seawater with a spatially
! varying rate as a form of outflow open boundary condition.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,9 @@ DO_ICE_RESTORE = False ! [Boolean] default = False
! If true, restore the sea ice state toward climatology.
NUDGE_SEA_ICE = False ! [Boolean] default = False
! If true, constrain the sea ice concentrations using observations.
TRANSMUTE_SEA_ICE = False ! [Boolean] default = False
! If true, allow ice to be transmuted directly into seawater with a spatially
! varying rate as a form of outflow open boundary condition.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
18 changes: 10 additions & 8 deletions ice_ocean_SIS2/Baltic/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,22 +258,21 @@ CONCENTRATION_INIT_CONFIG = "data_override" ! default = "data_override"
! initialized for a new run:
! file - read sea ice concentrations from a specified file
! data_override - use the data_override capability or zero everywhere
! zero - there is no sea ice anywhere.
! zero - there is no sea ice anywhere
! latitudes - initial sea ice concentration is a function of latitude.
ICE_THICKNESS_INIT_CONFIG = "data_override" ! default = "data_override"
! A string that determines how the initial total sea ice concentration is
! initialized for a new run:
! file - read sea ice concentrations from a specified file
! A string that determines how the initial sea ice thickness is initialized for
! a new run:
! file - read sea ice thickesses from a specified file
! data_override - use the data_override capability or zero everywhere
! uniform - sea ice has uniform thickness where the concentration is
! nonzero.
SNOW_THICKNESS_INIT_CONFIG = "data_override" ! default = "data_override"
! A string that determines how the initial total sea ice concentration is
! initialized for a new run:
! A string that determines how the initial total snow thickness is initialized
! for a new run:
! file - read sea ice concentrations from a specified file
! data_override - use the data_override capability or zero everywhere
! uniform - sea ice has uniform thickness where the concentration is
! nonzero.
! uniform - snow has uniform thickness where the concentration is nonzero.
ICE_SALINITY_INIT_CONFIG = "uniform" ! default = "uniform"
! A string that determines how the sea ice salinity is initialized for a new
! run:
Expand Down Expand Up @@ -322,6 +321,9 @@ DO_ICE_RESTORE = False ! [Boolean] default = False
! If true, restore the sea ice state toward climatology.
NUDGE_SEA_ICE = False ! [Boolean] default = False
! If true, constrain the sea ice concentrations using observations.
TRANSMUTE_SEA_ICE = False ! [Boolean] default = False
! If true, allow ice to be transmuted directly into seawater with a spatially
! varying rate as a form of outflow open boundary condition.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
18 changes: 10 additions & 8 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,22 +240,21 @@ CONCENTRATION_INIT_CONFIG = "data_override" ! default = "data_override"
! initialized for a new run:
! file - read sea ice concentrations from a specified file
! data_override - use the data_override capability or zero everywhere
! zero - there is no sea ice anywhere.
! zero - there is no sea ice anywhere
! latitudes - initial sea ice concentration is a function of latitude.
ICE_THICKNESS_INIT_CONFIG = "data_override" ! default = "data_override"
! A string that determines how the initial total sea ice concentration is
! initialized for a new run:
! file - read sea ice concentrations from a specified file
! A string that determines how the initial sea ice thickness is initialized for
! a new run:
! file - read sea ice thickesses from a specified file
! data_override - use the data_override capability or zero everywhere
! uniform - sea ice has uniform thickness where the concentration is
! nonzero.
SNOW_THICKNESS_INIT_CONFIG = "data_override" ! default = "data_override"
! A string that determines how the initial total sea ice concentration is
! initialized for a new run:
! A string that determines how the initial total snow thickness is initialized
! for a new run:
! file - read sea ice concentrations from a specified file
! data_override - use the data_override capability or zero everywhere
! uniform - sea ice has uniform thickness where the concentration is
! nonzero.
! uniform - snow has uniform thickness where the concentration is nonzero.
ICE_SALINITY_INIT_CONFIG = "uniform" ! default = "uniform"
! A string that determines how the sea ice salinity is initialized for a new
! run:
Expand Down Expand Up @@ -304,6 +303,9 @@ DO_ICE_RESTORE = False ! [Boolean] default = False
! If true, restore the sea ice state toward climatology.
NUDGE_SEA_ICE = False ! [Boolean] default = False
! If true, constrain the sea ice concentrations using observations.
TRANSMUTE_SEA_ICE = False ! [Boolean] default = False
! If true, allow ice to be transmuted directly into seawater with a spatially
! varying rate as a form of outflow open boundary condition.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
18 changes: 10 additions & 8 deletions ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,22 +240,21 @@ CONCENTRATION_INIT_CONFIG = "data_override" ! default = "data_override"
! initialized for a new run:
! file - read sea ice concentrations from a specified file
! data_override - use the data_override capability or zero everywhere
! zero - there is no sea ice anywhere.
! zero - there is no sea ice anywhere
! latitudes - initial sea ice concentration is a function of latitude.
ICE_THICKNESS_INIT_CONFIG = "data_override" ! default = "data_override"
! A string that determines how the initial total sea ice concentration is
! initialized for a new run:
! file - read sea ice concentrations from a specified file
! A string that determines how the initial sea ice thickness is initialized for
! a new run:
! file - read sea ice thickesses from a specified file
! data_override - use the data_override capability or zero everywhere
! uniform - sea ice has uniform thickness where the concentration is
! nonzero.
SNOW_THICKNESS_INIT_CONFIG = "data_override" ! default = "data_override"
! A string that determines how the initial total sea ice concentration is
! initialized for a new run:
! A string that determines how the initial total snow thickness is initialized
! for a new run:
! file - read sea ice concentrations from a specified file
! data_override - use the data_override capability or zero everywhere
! uniform - sea ice has uniform thickness where the concentration is
! nonzero.
! uniform - snow has uniform thickness where the concentration is nonzero.
ICE_SALINITY_INIT_CONFIG = "uniform" ! default = "uniform"
! A string that determines how the sea ice salinity is initialized for a new
! run:
Expand Down Expand Up @@ -304,6 +303,9 @@ DO_ICE_RESTORE = False ! [Boolean] default = False
! If true, restore the sea ice state toward climatology.
NUDGE_SEA_ICE = False ! [Boolean] default = False
! If true, constrain the sea ice concentrations using observations.
TRANSMUTE_SEA_ICE = False ! [Boolean] default = False
! If true, allow ice to be transmuted directly into seawater with a spatially
! varying rate as a form of outflow open boundary condition.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
18 changes: 10 additions & 8 deletions ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,22 +240,21 @@ CONCENTRATION_INIT_CONFIG = "data_override" ! default = "data_override"
! initialized for a new run:
! file - read sea ice concentrations from a specified file
! data_override - use the data_override capability or zero everywhere
! zero - there is no sea ice anywhere.
! zero - there is no sea ice anywhere
! latitudes - initial sea ice concentration is a function of latitude.
ICE_THICKNESS_INIT_CONFIG = "data_override" ! default = "data_override"
! A string that determines how the initial total sea ice concentration is
! initialized for a new run:
! file - read sea ice concentrations from a specified file
! A string that determines how the initial sea ice thickness is initialized for
! a new run:
! file - read sea ice thickesses from a specified file
! data_override - use the data_override capability or zero everywhere
! uniform - sea ice has uniform thickness where the concentration is
! nonzero.
SNOW_THICKNESS_INIT_CONFIG = "data_override" ! default = "data_override"
! A string that determines how the initial total sea ice concentration is
! initialized for a new run:
! A string that determines how the initial total snow thickness is initialized
! for a new run:
! file - read sea ice concentrations from a specified file
! data_override - use the data_override capability or zero everywhere
! uniform - sea ice has uniform thickness where the concentration is
! nonzero.
! uniform - snow has uniform thickness where the concentration is nonzero.
ICE_SALINITY_INIT_CONFIG = "uniform" ! default = "uniform"
! A string that determines how the sea ice salinity is initialized for a new
! run:
Expand Down Expand Up @@ -301,6 +300,9 @@ DO_ICE_RESTORE = False ! [Boolean] default = False
! If true, restore the sea ice state toward climatology.
NUDGE_SEA_ICE = False ! [Boolean] default = False
! If true, constrain the sea ice concentrations using observations.
TRANSMUTE_SEA_ICE = False ! [Boolean] default = False
! If true, allow ice to be transmuted directly into seawater with a spatially
! varying rate as a form of outflow open boundary condition.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
18 changes: 10 additions & 8 deletions ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,22 +242,21 @@ CONCENTRATION_INIT_CONFIG = "data_override" ! default = "data_override"
! initialized for a new run:
! file - read sea ice concentrations from a specified file
! data_override - use the data_override capability or zero everywhere
! zero - there is no sea ice anywhere.
! zero - there is no sea ice anywhere
! latitudes - initial sea ice concentration is a function of latitude.
ICE_THICKNESS_INIT_CONFIG = "data_override" ! default = "data_override"
! A string that determines how the initial total sea ice concentration is
! initialized for a new run:
! file - read sea ice concentrations from a specified file
! A string that determines how the initial sea ice thickness is initialized for
! a new run:
! file - read sea ice thickesses from a specified file
! data_override - use the data_override capability or zero everywhere
! uniform - sea ice has uniform thickness where the concentration is
! nonzero.
SNOW_THICKNESS_INIT_CONFIG = "data_override" ! default = "data_override"
! A string that determines how the initial total sea ice concentration is
! initialized for a new run:
! A string that determines how the initial total snow thickness is initialized
! for a new run:
! file - read sea ice concentrations from a specified file
! data_override - use the data_override capability or zero everywhere
! uniform - sea ice has uniform thickness where the concentration is
! nonzero.
! uniform - snow has uniform thickness where the concentration is nonzero.
ICE_SALINITY_INIT_CONFIG = "uniform" ! default = "uniform"
! A string that determines how the sea ice salinity is initialized for a new
! run:
Expand Down Expand Up @@ -306,6 +305,9 @@ DO_ICE_RESTORE = False ! [Boolean] default = False
! If true, restore the sea ice state toward climatology.
NUDGE_SEA_ICE = False ! [Boolean] default = False
! If true, constrain the sea ice concentrations using observations.
TRANSMUTE_SEA_ICE = False ! [Boolean] default = False
! If true, allow ice to be transmuted directly into seawater with a spatially
! varying rate as a form of outflow open boundary condition.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
Loading

0 comments on commit 379c245

Please sign in to comment.