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 index e74845800..a2b2e0cd3 100644 --- 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 @@ -46,7 +46,7 @@ NJPROC = 6 ! ! in MOM_memory.h at compile time. LAYOUT = 10, 6 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. 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 index e64d4b410..eded439aa 100644 --- 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 @@ -44,7 +44,7 @@ NJPROC = 5 ! ! in SIS2_memory.h at compile time. LAYOUT = 6, 5 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 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 index e74845800..a2b2e0cd3 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.layout +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 6 ! ! in MOM_memory.h at compile time. LAYOUT = 10, 6 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.layout b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.layout index bc305964b..c4c05eaba 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.layout +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.layout @@ -42,7 +42,7 @@ NJPROC_FAST = 5 ! ! in SIS2_memory.h at compile time. LAYOUT_FAST = 6, 5 ! ! The processor layout that was actually used. -IO_LAYOUT_FAST = 1, 1 ! default = 1 +IO_LAYOUT_FAST = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 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 index cf07bbfb9..224828ea5 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.layout +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 6 ! ! in SIS2_memory.h at compile time. LAYOUT = 10, 6 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 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 index e74845800..a2b2e0cd3 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.layout +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 6 ! ! in MOM_memory.h at compile time. LAYOUT = 10, 6 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_fast_parameter_doc.layout b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_fast_parameter_doc.layout index bc305964b..c4c05eaba 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_fast_parameter_doc.layout +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_fast_parameter_doc.layout @@ -42,7 +42,7 @@ NJPROC_FAST = 5 ! ! in SIS2_memory.h at compile time. LAYOUT_FAST = 6, 5 ! ! The processor layout that was actually used. -IO_LAYOUT_FAST = 1, 1 ! default = 1 +IO_LAYOUT_FAST = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 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 index cf07bbfb9..224828ea5 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_parameter_doc.layout +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 6 ! ! in SIS2_memory.h at compile time. LAYOUT = 10, 6 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.layout b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.layout index 152219e79..7c40e01ac 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.layout +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.layout index f44320f1d..f3ba794c4 100644 --- a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in SIS2_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 @@ -74,6 +74,6 @@ NJPROC_FAST = 1 ! ! in SIS2_memory.h at compile time. LAYOUT_FAST = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT_FAST = 1, 1 ! default = 1 +IO_LAYOUT_FAST = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all index c0975e5eb..a4bb66e24 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all @@ -1272,7 +1272,7 @@ TIDAL_SAL_FROM_FILE = False ! [Boolean] default = False USE_PREVIOUS_TIDES = False ! [Boolean] default = False ! If true, use the SAL from the previous iteration of the tides to facilitate ! convergent iteration. This is only used if TIDES is true. -TIDE_REF_DATE = 0, 0, 0 ! default = 0 +TIDE_REF_DATE = 0, 0, 0 ! default = 0, 0, 0 ! Year,month,day to use as reference date for tidal forcing. If not specified, ! defaults to 0. TIDE_USE_EQ_PHASE = False ! [Boolean] default = False 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 index 152219e79..7c40e01ac 100644 --- 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 @@ -46,7 +46,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. 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 index 11b39d177..e21d69d6a 100644 --- 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 @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in SIS2_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.layout index 9092ef024..5499d8c88 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.layout +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 8 ! ! in MOM_memory.h at compile time. LAYOUT = 4, 8 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.layout index ac06a0f46..07d03ed49 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 8 ! ! in SIS2_memory.h at compile time. LAYOUT = 4, 8 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.layout index 1f380e373..655ec0b6c 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.layout +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 4 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 4 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.layout index 7e42947b3..2aa47c42c 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 4 ! ! in SIS2_memory.h at compile time. LAYOUT = 2, 4 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.layout b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.layout index 11ffedf90..cb6a72356 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.layout +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 18 ! ! in MOM_memory.h at compile time. LAYOUT = 32, 18 ! ! The processor layout that was actually used. -IO_LAYOUT = 2, 2 ! default = 1 +IO_LAYOUT = 2, 2 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.layout b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.layout index a0564eac6..df03b4154 100644 --- a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 18 ! ! in SIS2_memory.h at compile time. LAYOUT = 32, 18 ! ! The processor layout that was actually used. -IO_LAYOUT = 2, 2 ! default = 1 +IO_LAYOUT = 2, 2 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.layout b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.layout index a6b353b0b..436338d42 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.layout +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 20 ! ! in MOM_memory.h at compile time. LAYOUT = 21, 20 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.layout b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.layout index 6b1021fa7..c278699b5 100644 --- a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 20 ! ! in SIS2_memory.h at compile time. LAYOUT = 21, 20 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.layout b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.layout index bb47bdac1..d8d452cf5 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.layout +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 10 ! ! in MOM_memory.h at compile time. LAYOUT = 12, 10 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.layout b/ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.layout index ea97f029e..77e518070 100644 --- a/ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 10 ! ! in SIS2_memory.h at compile time. LAYOUT = 12, 10 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.layout b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.layout index e74845800..a2b2e0cd3 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.layout +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 6 ! ! in MOM_memory.h at compile time. LAYOUT = 10, 6 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.layout b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.layout index cf07bbfb9..224828ea5 100644 --- a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 6 ! ! in SIS2_memory.h at compile time. LAYOUT = 10, 6 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.layout b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.layout index e74845800..a2b2e0cd3 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.layout +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 6 ! ! in MOM_memory.h at compile time. LAYOUT = 10, 6 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.layout b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.layout index cf07bbfb9..224828ea5 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 6 ! ! in SIS2_memory.h at compile time. LAYOUT = 10, 6 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.layout b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.layout index e74845800..a2b2e0cd3 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.layout +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 6 ! ! in MOM_memory.h at compile time. LAYOUT = 10, 6 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.layout b/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.layout index cf07bbfb9..224828ea5 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 6 ! ! in SIS2_memory.h at compile time. LAYOUT = 10, 6 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. NIBLOCK = 1 ! default = 1 diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.layout b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.layout +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.layout b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.layout +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.layout b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.layout +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.layout b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.layout +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.layout b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.layout +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.layout b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.layout +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.layout b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.layout +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.layout b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.layout +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.layout b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.layout +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.layout b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.layout +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.layout b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.layout +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.layout b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.layout +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/DOME/MOM_parameter_doc.layout b/ocean_only/DOME/MOM_parameter_doc.layout index 638d9b5a8..f53725906 100644 --- a/ocean_only/DOME/MOM_parameter_doc.layout +++ b/ocean_only/DOME/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 2 ! ! in MOM_memory.h at compile time. LAYOUT = 3, 2 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.layout b/ocean_only/Phillips_2layer/MOM_parameter_doc.layout index 98cdd53bc..8b1412957 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.layout +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 16 ! ! in MOM_memory.h at compile time. LAYOUT = 4, 16 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.layout b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.layout +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.layout b/ocean_only/adjustment2d/layer/MOM_parameter_doc.layout index 52683bc4e..126209f1b 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.layout +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.layout b/ocean_only/adjustment2d/rho/MOM_parameter_doc.layout index 52683bc4e..126209f1b 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.layout +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.layout b/ocean_only/adjustment2d/z/MOM_parameter_doc.layout index 52683bc4e..126209f1b 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.layout +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/benchmark/MOM_parameter_doc.layout b/ocean_only/benchmark/MOM_parameter_doc.layout index 596b61eef..1c36d1299 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.layout +++ b/ocean_only/benchmark/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 6 ! ! in MOM_memory.h at compile time. LAYOUT = 12, 6 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.layout b/ocean_only/circle_obcs/MOM_parameter_doc.layout index 062bfa913..2d8855458 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.layout +++ b/ocean_only/circle_obcs/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 2 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 2 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/double_gyre/MOM_parameter_doc.layout b/ocean_only/double_gyre/MOM_parameter_doc.layout index 7416d98ee..b02309ece 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.layout +++ b/ocean_only/double_gyre/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 4 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 4 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/external_gwave/MOM_parameter_doc.layout b/ocean_only/external_gwave/MOM_parameter_doc.layout index 52683bc4e..126209f1b 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.layout +++ b/ocean_only/external_gwave/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.layout b/ocean_only/flow_downslope/layer/MOM_parameter_doc.layout index 52683bc4e..126209f1b 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.layout +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.layout b/ocean_only/flow_downslope/rho/MOM_parameter_doc.layout index 52683bc4e..126209f1b 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.layout +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.layout b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.layout index 52683bc4e..126209f1b 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.layout +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.layout b/ocean_only/flow_downslope/z/MOM_parameter_doc.layout index 52683bc4e..126209f1b 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.layout +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 3a92323d8..7fed2921d 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1322,7 +1322,7 @@ TIDAL_SAL_FROM_FILE = False ! [Boolean] default = False USE_PREVIOUS_TIDES = False ! [Boolean] default = False ! If true, use the SAL from the previous iteration of the tides to facilitate ! convergent iteration. This is only used if TIDES is true. -TIDE_REF_DATE = 0, 0, 0 ! default = 0 +TIDE_REF_DATE = 0, 0, 0 ! default = 0, 0, 0 ! Year,month,day to use as reference date for tidal forcing. If not specified, ! defaults to 0. TIDE_USE_EQ_PHASE = False ! [Boolean] default = False diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.layout b/ocean_only/global_ALE/hycom/MOM_parameter_doc.layout index a53da7a13..2402696ab 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.layout +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 8 ! ! in MOM_memory.h at compile time. LAYOUT = 8, 8 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index e3cd651f8..48275cdb0 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1206,7 +1206,7 @@ TIDAL_SAL_FROM_FILE = False ! [Boolean] default = False USE_PREVIOUS_TIDES = False ! [Boolean] default = False ! If true, use the SAL from the previous iteration of the tides to facilitate ! convergent iteration. This is only used if TIDES is true. -TIDE_REF_DATE = 0, 0, 0 ! default = 0 +TIDE_REF_DATE = 0, 0, 0 ! default = 0, 0, 0 ! Year,month,day to use as reference date for tidal forcing. If not specified, ! defaults to 0. TIDE_USE_EQ_PHASE = False ! [Boolean] default = False diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.layout b/ocean_only/global_ALE/layer/MOM_parameter_doc.layout index a53da7a13..2402696ab 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.layout +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 8 ! ! in MOM_memory.h at compile time. LAYOUT = 8, 8 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index d79eb5c2e..a8c5c09d9 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1269,7 +1269,7 @@ TIDAL_SAL_FROM_FILE = False ! [Boolean] default = False USE_PREVIOUS_TIDES = False ! [Boolean] default = False ! If true, use the SAL from the previous iteration of the tides to facilitate ! convergent iteration. This is only used if TIDES is true. -TIDE_REF_DATE = 0, 0, 0 ! default = 0 +TIDE_REF_DATE = 0, 0, 0 ! default = 0, 0, 0 ! Year,month,day to use as reference date for tidal forcing. If not specified, ! defaults to 0. TIDE_USE_EQ_PHASE = False ! [Boolean] default = False diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.layout b/ocean_only/global_ALE/z/MOM_parameter_doc.layout index a53da7a13..2402696ab 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.layout +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 8 ! ! in MOM_memory.h at compile time. LAYOUT = 8, 8 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.layout b/ocean_only/lock_exchange/MOM_parameter_doc.layout index 52683bc4e..126209f1b 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.layout +++ b/ocean_only/lock_exchange/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.layout b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.layout index 062bfa913..2d8855458 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.layout +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 2 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 2 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index c053133b6..ac7ebb895 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1036,7 +1036,7 @@ TIDAL_SAL_FROM_FILE = False ! [Boolean] default = False USE_PREVIOUS_TIDES = False ! [Boolean] default = False ! If true, use the SAL from the previous iteration of the tides to facilitate ! convergent iteration. This is only used if TIDES is true. -TIDE_REF_DATE = 0, 0, 0 ! default = 0 +TIDE_REF_DATE = 0, 0, 0 ! default = 0, 0, 0 ! Year,month,day to use as reference date for tidal forcing. If not specified, ! defaults to 0. TIDE_USE_EQ_PHASE = False ! [Boolean] default = False diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.layout b/ocean_only/nonBous_global/MOM_parameter_doc.layout index e74845800..a2b2e0cd3 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.layout +++ b/ocean_only/nonBous_global/MOM_parameter_doc.layout @@ -46,7 +46,7 @@ NJPROC = 6 ! ! in MOM_memory.h at compile time. LAYOUT = 10, 6 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/resting/layer/MOM_parameter_doc.layout b/ocean_only/resting/layer/MOM_parameter_doc.layout index 55a9c3cfd..3b8e9dbfb 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.layout +++ b/ocean_only/resting/layer/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/resting/z/MOM_parameter_doc.layout b/ocean_only/resting/z/MOM_parameter_doc.layout index 55a9c3cfd..3b8e9dbfb 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.layout +++ b/ocean_only/resting/z/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.layout b/ocean_only/seamount/layer/MOM_parameter_doc.layout index 55a9c3cfd..3b8e9dbfb 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.layout +++ b/ocean_only/seamount/layer/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.layout b/ocean_only/seamount/rho/MOM_parameter_doc.layout index 55a9c3cfd..3b8e9dbfb 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.layout +++ b/ocean_only/seamount/rho/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.layout b/ocean_only/seamount/sigma/MOM_parameter_doc.layout index 55a9c3cfd..3b8e9dbfb 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.layout +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/seamount/z/MOM_parameter_doc.layout b/ocean_only/seamount/z/MOM_parameter_doc.layout index 55a9c3cfd..3b8e9dbfb 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.layout +++ b/ocean_only/seamount/z/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.layout b/ocean_only/single_column/BML/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.layout +++ b/ocean_only/single_column/BML/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.layout b/ocean_only/single_column/EPBL/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.layout +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.layout b/ocean_only/single_column/KPP/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.layout +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.layout b/ocean_only/sloshing/layer/MOM_parameter_doc.layout index 55a9c3cfd..3b8e9dbfb 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.layout +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.layout b/ocean_only/sloshing/rho/MOM_parameter_doc.layout index 55a9c3cfd..3b8e9dbfb 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.layout +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.layout b/ocean_only/sloshing/z/MOM_parameter_doc.layout index 55a9c3cfd..3b8e9dbfb 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.layout +++ b/ocean_only/sloshing/z/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.layout b/ocean_only/torus_advection_test/MOM_parameter_doc.layout index 062bfa913..2d8855458 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.layout +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 2 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 2 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.layout b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.layout index 52683bc4e..126209f1b 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.layout +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.layout b/ocean_only/tracer_mixing/z/MOM_parameter_doc.layout index 52683bc4e..126209f1b 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.layout +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 2, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/ocean_only/unit_tests/MOM_parameter_doc.layout b/ocean_only/unit_tests/MOM_parameter_doc.layout index d0bf97249..52bbdb2d4 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.layout +++ b/ocean_only/unit_tests/MOM_parameter_doc.layout @@ -44,7 +44,7 @@ NJPROC = 1 ! ! in MOM_memory.h at compile time. LAYOUT = 1, 1 ! ! The processor layout that was actually used. -IO_LAYOUT = 1, 1 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1, 1 ! The processor layout to be used, or 0,0 to automatically set the io_layout to ! be the same as the layout. diff --git a/src/MOM6 b/src/MOM6 index d8a270b6e..7ca5ed9f2 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit d8a270b6e815a9053103dea7ac2fd3980b1327d1 +Subproject commit 7ca5ed9f2c233a19ce68801ee92558cf2e9638eb