Skip to content

SIS2: +Rename checksum scale argument to unscale #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2025
Merged

SIS2: +Rename checksum scale argument to unscale #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === 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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === 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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === 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 ice_ocean_SIS2/Baltic/SIS_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === 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 ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === 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 ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === 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 ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === 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 ice_ocean_SIS2/Baltic_OM5_025/SIS_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === 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 ice_ocean_SIS2/Baltic_OM5nb_025/SIS_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === 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 ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === 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 ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === 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 ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === 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 ice_ocean_SIS2/SIS2/SIS.available_diags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@
"ice_model", "RDG_RATE" [Unused]
! long_name: ice ridging rate
! units: 1/sec
"ice_model", "RDG_HEIGHT" [Unused]
! long_name: ice ridge height
! units: m
"ice_model", "FA_X" [Used]
! long_name: air stress on ice - x component
! units: Pa
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2/SIS_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
6 changes: 6 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/SIS.available_diags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,9 @@
"ice_model", "del_sh_min" [Unused]
! long_name: minimum ice strain rate magnitude
! units: s-1
"ice_model", "itheta" [Unused]
! long_name: ice atan(shear/divergence)
! units: rad
"ice_model", "ui_hf" [Unused]
! long_name: ice velocity - x component
! units: m/s
Expand Down Expand Up @@ -338,6 +341,9 @@
"ice_model", "RDG_RATE" [Unused]
! long_name: ice ridging rate
! units: 1/sec
"ice_model", "RDG_HEIGHT" [Unused]
! long_name: ice ridge height
! units: m
"ice_model", "FA_X" [Used]
! long_name: Air stress on ice on C-grid - x component
! units: Pa
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
6 changes: 6 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/SIS.available_diags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,9 @@
"ice_model", "del_sh_min" [Used]
! long_name: minimum ice strain rate magnitude
! units: s-1
"ice_model", "itheta" [Unused]
! long_name: ice atan(shear/divergence)
! units: rad
"ice_model", "ui_hf" [Unused]
! long_name: ice velocity - x component
! units: m/s
Expand Down Expand Up @@ -329,6 +332,9 @@
"ice_model", "RDG_RATE" [Unused]
! long_name: ice ridging rate
! units: 1/sec
"ice_model", "RDG_HEIGHT" [Unused]
! long_name: ice ridge height
! units: m
"ice_model", "FA_X" [Used]
! long_name: Air stress on ice on C-grid - x component
! units: Pa
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,9 @@ NUDGE_SEA_ICE = False ! [Boolean] default = False
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.
SIS_SPONGE = False ! [Boolean] default = False
! If true, SIS sponges may be applied anywhere in the domain. The exact location
! and properties of those sponges are specified via SIS_SPONGE_CONFIG.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
2 changes: 1 addition & 1 deletion src/SIS2
Open in desktop
Submodule SIS2 updated 30 files
+2 −0 .gitignore
+80 −45 .gitlab-ci.yml
+4 −0 config_src/dynamic/SIS2_memory.h
+7 −0 config_src/dynamic_symmetric/SIS2_memory.h
+124 −125 config_src/external/Icepack_interfaces/icepack_itd.F90
+14 −20 config_src/external/Icepack_interfaces/icepack_kinds.F90
+78 −92 config_src/external/Icepack_interfaces/icepack_mechred.F90
+57 −0 config_src/external/Icepack_interfaces/icepack_meltpond_lvl.F90
+64 −0 config_src/external/Icepack_interfaces/icepack_meltpond_topo.F90
+1,056 −1,082 config_src/external/Icepack_interfaces/icepack_parameters.F90
+142 −146 config_src/external/Icepack_interfaces/icepack_tracers.F90
+125 −153 config_src/external/Icepack_interfaces/icepack_warnings.F90
+9 −0 docs/zotero.bib
+3 −0 src/SIS_ctrl_types.F90
+239 −126 src/SIS_debugging.F90
+6 −1 src/SIS_diag_mediator.F90
+25 −25 src/SIS_dyn_bgrid.F90
+41 −18 src/SIS_dyn_cgrid.F90
+68 −62 src/SIS_dyn_trans.F90
+21 −21 src/SIS_fast_thermo.F90
+4 −4 src/SIS_fixed_initialization.F90
+2 −2 src/SIS_ice_diags.F90
+25 −2 src/SIS_slow_thermo.F90
+839 −0 src/SIS_sponge.F90
+20 −5 src/SIS_transport.F90
+74 −74 src/SIS_types.F90
+19 −19 src/SIS_utils.F90
+13 −4 src/ice_model.F90
+306 −260 src/ice_ridge.F90
+2 −0 src/specified_ice.F90