Updated version of SIS2 following SIS2 PR #173

Updated the version of SIS2 that MOM6-examples points to, following SIS2 PR bitwise identical, but there are new runtime parameters. The SIS2 commits that are included in this update are: - NOAA-GFDL/SIS2@4b29776 Merge branch 'ice_OBCs' into dev/gfdl - NOAA-GFDL/SIS2@33589c6 Fixed the syntax of new comments in PR #173 - NOAA-GFDL/SIS2@164e404 Getting OBCs with MERGED_CONTINUITY to work - NOAA-GFDL/SIS2@d62188d OBC's for C-grid stress. - NOAA-GFDL/SIS2@c84a83b Start of ice OBCs - it compiles. - NOAA-GFDL/SIS2@2ac240a Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg - NOAA-GFDL/SIS2@a9884b8 Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg - NOAA-GFDL/SIS2@3399a73 Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
NOAA-GFDL · May 22, 2022 · bf2248b · bf2248b
1 parent a241607
commit bf2248b
Show file tree

Hide file tree

Showing 14 changed files with 83 additions and 1 deletion.
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
@@ -183,6 +183,12 @@ MASKING_DEPTH = -9999.0         !   [m] default = -9999.0
                                 ! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
 !MAXIMUM_DEPTH = 6000.0         !   [m]
                                 ! The (diagnosed) maximum depth of the ocean.
+
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+OBC_NUMBER_OF_SEGMENTS = 0      ! default = 0
+                                ! The number of open boundary segments.
 CHANNEL_CONFIG = "none"         ! default = "none"
                                 ! A parameter that determines which set of channels are restricted to specific
                                 ! widths.  Options are:

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
@@ -183,6 +183,12 @@ MASKING_DEPTH = -9999.0         !   [m] default = -9999.0
                                 ! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
 !MAXIMUM_DEPTH = 6000.0         !   [m]
                                 ! The (diagnosed) maximum depth of the ocean.
+
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+OBC_NUMBER_OF_SEGMENTS = 0      ! default = 0
+                                ! The number of open boundary segments.
 CHANNEL_CONFIG = "none"         ! default = "none"
                                 ! A parameter that determines which set of channels are restricted to specific
                                 ! widths.  Options are:

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
@@ -183,6 +183,12 @@ MASKING_DEPTH = -9999.0         !   [m] default = -9999.0
                                 ! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
 !MAXIMUM_DEPTH = 6000.0         !   [m]
                                 ! The (diagnosed) maximum depth of the ocean.
+
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+OBC_NUMBER_OF_SEGMENTS = 0      ! default = 0
+                                ! The number of open boundary segments.
 CHANNEL_CONFIG = "none"         ! default = "none"
                                 ! A parameter that determines which set of channels are restricted to specific
                                 ! widths.  Options are:

diff --git a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all
@@ -183,6 +183,12 @@ MASKING_DEPTH = -9999.0         !   [m] default = -9999.0
                                 ! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
 !MAXIMUM_DEPTH = 608.4598627866924 !   [m]
                                 ! The (diagnosed) maximum depth of the ocean.
+
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+OBC_NUMBER_OF_SEGMENTS = 0      ! default = 0
+                                ! The number of open boundary segments.
 CHANNEL_CONFIG = "none"         ! default = "none"
                                 ! A parameter that determines which set of channels are restricted to specific
                                 ! widths.  Options are:
@@ -262,6 +268,10 @@ NJHALO_FAST = 0                 ! default = 0
 
 ! === module MOM_grid_init ===
 
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+
 ! === module hor_grid ===
 ! Parameters providing information about the lateral grid.
 

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
@@ -183,6 +183,12 @@ MASKING_DEPTH = -9999.0         !   [m] default = -9999.0
                                 ! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
 !MAXIMUM_DEPTH = 608.4598627866924 !   [m]
                                 ! The (diagnosed) maximum depth of the ocean.
+
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+OBC_NUMBER_OF_SEGMENTS = 0      ! default = 0
+                                ! The number of open boundary segments.
 CHANNEL_CONFIG = "none"         ! default = "none"
                                 ! A parameter that determines which set of channels are restricted to specific
                                 ! widths.  Options are:

diff --git a/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all
@@ -183,6 +183,12 @@ MASKING_DEPTH = -9999.0         !   [m] default = -9999.0
                                 ! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
 !MAXIMUM_DEPTH = 621.958251953125 !   [m]
                                 ! The (diagnosed) maximum depth of the ocean.
+
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+OBC_NUMBER_OF_SEGMENTS = 0      ! default = 0
+                                ! The number of open boundary segments.
 CHANNEL_CONFIG = "none"         ! default = "none"
                                 ! A parameter that determines which set of channels are restricted to specific
                                 ! widths.  Options are:

diff --git a/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all
@@ -183,6 +183,12 @@ MASKING_DEPTH = -9999.0         !   [m] default = -9999.0
                                 ! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
 !MAXIMUM_DEPTH = 588.986572265625 !   [m]
                                 ! The (diagnosed) maximum depth of the ocean.
+
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+OBC_NUMBER_OF_SEGMENTS = 0      ! default = 0
+                                ! The number of open boundary segments.
 CHANNEL_CONFIG = "none"         ! default = "none"
                                 ! A parameter that determines which set of channels are restricted to specific
                                 ! widths.  Options are:

diff --git a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all
@@ -185,6 +185,12 @@ MASKING_DEPTH = -9999.0         !   [m] default = -9999.0
                                 ! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
 !MAXIMUM_DEPTH = 9682.232421875 !   [m]
                                 ! The (diagnosed) maximum depth of the ocean.
+
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+OBC_NUMBER_OF_SEGMENTS = 0      ! default = 0
+                                ! The number of open boundary segments.
 CHANNEL_CONFIG = "none"         ! default = "none"
                                 ! A parameter that determines which set of channels are restricted to specific
                                 ! widths.  Options are:

diff --git a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all
@@ -185,6 +185,12 @@ MASKING_DEPTH = -9999.0         !   [m] default = -9999.0
                                 ! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
 !MAXIMUM_DEPTH = 8799.6513671875 !   [m]
                                 ! The (diagnosed) maximum depth of the ocean.
+
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+OBC_NUMBER_OF_SEGMENTS = 0      ! default = 0
+                                ! The number of open boundary segments.
 CHANNEL_CONFIG = "none"         ! default = "none"
                                 ! A parameter that determines which set of channels are restricted to specific
                                 ! widths.  Options are:

diff --git a/ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.all
@@ -185,6 +185,12 @@ MASKING_DEPTH = -9999.0         !   [m] default = -9999.0
                                 ! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
 !MAXIMUM_DEPTH = 8317.21875     !   [m]
                                 ! The (diagnosed) maximum depth of the ocean.
+
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+OBC_NUMBER_OF_SEGMENTS = 0      ! default = 0
+                                ! The number of open boundary segments.
 CHANNEL_CONFIG = "none"         ! default = "none"
                                 ! A parameter that determines which set of channels are restricted to specific
                                 ! widths.  Options are:

diff --git a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all
@@ -183,6 +183,12 @@ MASKING_DEPTH = -9999.0         !   [m] default = -9999.0
                                 ! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
 !MAXIMUM_DEPTH = 6000.0         !   [m]
                                 ! The (diagnosed) maximum depth of the ocean.
+
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+OBC_NUMBER_OF_SEGMENTS = 0      ! default = 0
+                                ! The number of open boundary segments.
 CHANNEL_CONFIG = "none"         ! default = "none"
                                 ! A parameter that determines which set of channels are restricted to specific
                                 ! widths.  Options are:

diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all
@@ -185,6 +185,12 @@ MASKING_DEPTH = -9999.0         !   [m] default = -9999.0
                                 ! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
 !MAXIMUM_DEPTH = 6000.0         !   [m]
                                 ! The (diagnosed) maximum depth of the ocean.
+
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+OBC_NUMBER_OF_SEGMENTS = 0      ! default = 0
+                                ! The number of open boundary segments.
 CHANNEL_CONFIG = "none"         ! default = "none"
                                 ! A parameter that determines which set of channels are restricted to specific
                                 ! widths.  Options are:

diff --git a/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all
@@ -183,6 +183,12 @@ MASKING_DEPTH = -9999.0         !   [m] default = -9999.0
                                 ! zeroed out. MASKING_DEPTH is ignored if it has the special default value.
 !MAXIMUM_DEPTH = 6000.0         !   [m]
                                 ! The (diagnosed) maximum depth of the ocean.
+
+! === module SIS_open_boundary ===
+! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply,
+! if any.
+OBC_NUMBER_OF_SEGMENTS = 0      ! default = 0
+                                ! The number of open boundary segments.
 CHANNEL_CONFIG = "none"         ! default = "none"
                                 ! A parameter that determines which set of channels are restricted to specific
                                 ! widths.  Options are:

diff --git a/src/SIS2 b/src/SIS2
+222 −58		src/SIS_dyn_trans.F90
+22 −12		src/SIS_fixed_initialization.F90
+1,075 −0		src/SIS_open_boundary.F90
+9 −5		src/ice_model.F90
+3 −0		src/ice_type.F90