MOM6: Make the US argument to MOM_domains_init optional

- NOAA-GFDL/MOM6@de59adf02 Make the US argument to MOM_domains_init optional - NOAA-GFDL/MOM6@39368f04d Remove extra & from u/v_smooth - NOAA-GFDL/MOM6@71665fb65 Fix biharmonic leith (NOAA-GFDL#268) - NOAA-GFDL/MOM6@5578478a7 merge latest main and resolve conflicts in mom_cap. - NOAA-GFDL/MOM6@8f73fb2c1 fix intraday CESM restart file names (NOAA-GFDL#267) - NOAA-GFDL/MOM6@ab3b0aaa3 Automated Runtime Land Block Elimination (NOAA-GFDL#263) - NOAA-GFDL/MOM6@dcaadf71d set %label in register_netcdf_field and register_netcdf_axis (NOAA-GFDL#262)
mom6bot · Apr 10, 2024 · f4d01b2 · f4d01b2
1 parent abca8b7
commit f4d01b2
Show file tree

Hide file tree

Showing 32 changed files with 62 additions and 2 deletions.
diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.layout b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.layout
@@ -23,6 +23,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.layout b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.layout
@@ -21,6 +21,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.layout b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.layout
@@ -23,6 +23,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.layout b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.layout
@@ -21,6 +21,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.layout b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.layout
@@ -23,6 +23,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_parameter_doc.layout b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_parameter_doc.layout
@@ -21,6 +21,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.layout b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.layout
@@ -23,6 +23,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.layout
@@ -21,6 +21,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.layout b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.layout
@@ -23,6 +23,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.layout
@@ -21,6 +21,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.layout
@@ -23,6 +23,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.layout
@@ -21,6 +21,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.layout
@@ -23,6 +23,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.layout
@@ -21,6 +21,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.layout b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.layout
@@ -23,6 +23,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "mask_table.96.32x18" ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.layout b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.layout
@@ -21,6 +21,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "mask_table.96.32x18" ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.layout b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.layout
@@ -23,6 +23,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.layout b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.layout
@@ -21,6 +21,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
@@ -1392,7 +1392,7 @@ USE_KH_BG_2D = True             !   [Boolean] default = False
                                 ! viscosity is the maximum of the other terms and this background value.
 KH_BG_2D_BUG = False            !   [Boolean] default = False
                                 ! If true, retain an answer-changing horizontal indexing bug in setting the
-                                ! corner-point viscosities when USE_KH_BG_2D=True. This isnot recommended.
+                                ! corner-point viscosities when USE_KH_BG_2D=True.  This is not recommended.
 KH_BG_2D_FILENAME = "KH_background_2d.nc" ! default = "KH_background_2d.nc"
                                 ! The filename containing a 2d map of "Kh".
 KH_BG_2D_VARNAME = "Kh"         ! default = "Kh"

diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.layout b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.layout
@@ -23,6 +23,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.layout b/ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.layout
@@ -21,6 +21,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.layout b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.layout
@@ -23,6 +23,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the

diff --git a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.layout b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.layout
@@ -21,6 +21,8 @@ THIN_HALO_UPDATES = True        !   [Boolean] default = True
                                 ! statically determined at compile time.  Otherwise the sizes are not determined
                                 ! until run time. The STATIC option is substantially faster, but does not allow
                                 ! the PE count to be changed at run time.  This can only be set at compile time.
+AUTO_MASKTABLE = False          !   [Boolean] default = False
+                                ! Turn on automatic mask table generation to eliminate land blocks.
 MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 ! A text file to specify n_mask, layout and mask_list. This feature masks out
                                 ! processors that contain only land points. The first line of mask_table is the