From 15fd85d50814157bb53946e534432142eafc6132 Mon Sep 17 00:00:00 2001 From: MOM6 bot Date: Mon, 6 Jan 2025 16:36:36 -0500 Subject: [PATCH] MOM6: set descale in reproducing_sum_3d - NOAA-GFDL/MOM6@7ca5ed9f2 set descale in reproducing_sum_3d - NOAA-GFDL/MOM6@7846b80c1 +Add a vector of defaults to get_param_array_int - NOAA-GFDL/MOM6@81ea4b696 Corrected the rescaling of 5 KPP diagnostics - NOAA-GFDL/MOM6@fcf5fffdd Move MOM_generic_tracer with no changes (#22) - NOAA-GFDL/MOM6@45add79dd Updates to use EPBL_BBL_EFFIC - The present code only tests BBL_EFFIC when deciding whether to set the bottom TKE and ustar, but this means they are all zero when EPBL_BBL_EFFIC is non-zero and BBL_EFFIC is zero. - Adds logic to also check EPBL_BBL_EFFIC, thereby allowing non-zero ustar and TKE for EPBL_BBL_EFFIC>0.0 - Fixed BBL_TKE diagnostic in EPBL that was not populated. - Will change answers when EPBL_BBL_EFFIC>0.0, but won't change answers in any of our existing configurations. - NOAA-GFDL/MOM6@956449305 Update MOM_wave_interface.F90 (#784) - NOAA-GFDL/MOM6@9371bb02c Recover diagnostic "SSH_inst" - NOAA-GFDL/MOM6@8062d20d9 Minor change of SSH check in extract_surface_state - NOAA-GFDL/MOM6@dae622625 Fix indexing error in extract_surface_state - NOAA-GFDL/MOM6@e6e08702c Bug fix related to directional internal wave drag (#774) - NOAA-GFDL/MOM6@a4d13e825 Use reproducing_sum with unscale in 5 places - NOAA-GFDL/MOM6@8dcb6a46b Work in rescaled units in write_energy - NOAA-GFDL/MOM6@7060d51ef +Add RZL2_to_kg element to unit_scale_type - NOAA-GFDL/MOM6@a3cef876b +Add optional unscale argument to reproducing_sum --- .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.layout | 2 +- .../AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.layout | 2 +- .../Concurrent_ice_1deg/MOM_parameter_doc.layout | 2 +- .../Concurrent_ice_1deg/SIS_fast_parameter_doc.layout | 2 +- .../Concurrent_ice_1deg/SIS_parameter_doc.layout | 2 +- .../Intersperse_ice_1deg/MOM_parameter_doc.layout | 2 +- .../Intersperse_ice_1deg/SIS_fast_parameter_doc.layout | 2 +- .../Intersperse_ice_1deg/SIS_parameter_doc.layout | 2 +- ice_ocean_SIS2/Baltic/MOM_parameter_doc.layout | 2 +- ice_ocean_SIS2/Baltic/SIS_parameter_doc.layout | 4 ++-- .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 2 +- .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.layout | 2 +- .../Baltic_ALE_z_offline_tracers/SIS_parameter_doc.layout | 2 +- ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.layout | 2 +- ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.layout | 2 +- ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.layout | 2 +- ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.layout | 2 +- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.layout | 2 +- ice_ocean_SIS2/OM4_025/SIS_parameter_doc.layout | 2 +- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.layout | 2 +- ice_ocean_SIS2/OM4_05/SIS_parameter_doc.layout | 2 +- ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.layout | 2 +- ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.layout | 2 +- ice_ocean_SIS2/SIS2/MOM_parameter_doc.layout | 2 +- ice_ocean_SIS2/SIS2/SIS_parameter_doc.layout | 2 +- ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.layout | 2 +- ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.layout | 2 +- ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.layout | 2 +- ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.layout | 2 +- .../CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.layout | 2 +- .../cooling_only/EPBL/MOM_parameter_doc.layout | 2 +- .../CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.layout | 2 +- .../CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.layout | 2 +- .../CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.layout | 2 +- .../CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.layout | 2 +- .../skin_warming_wind/BML/MOM_parameter_doc.layout | 2 +- .../skin_warming_wind/EPBL/MOM_parameter_doc.layout | 2 +- .../skin_warming_wind/KPP/MOM_parameter_doc.layout | 2 +- .../CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.layout | 2 +- .../CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.layout | 2 +- .../CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.layout | 2 +- ocean_only/DOME/MOM_parameter_doc.layout | 2 +- ocean_only/Phillips_2layer/MOM_parameter_doc.layout | 2 +- ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.layout | 2 +- ocean_only/adjustment2d/layer/MOM_parameter_doc.layout | 2 +- ocean_only/adjustment2d/rho/MOM_parameter_doc.layout | 2 +- ocean_only/adjustment2d/z/MOM_parameter_doc.layout | 2 +- ocean_only/benchmark/MOM_parameter_doc.layout | 2 +- ocean_only/circle_obcs/MOM_parameter_doc.layout | 2 +- ocean_only/double_gyre/MOM_parameter_doc.layout | 2 +- ocean_only/external_gwave/MOM_parameter_doc.layout | 2 +- ocean_only/flow_downslope/layer/MOM_parameter_doc.layout | 2 +- ocean_only/flow_downslope/rho/MOM_parameter_doc.layout | 2 +- ocean_only/flow_downslope/sigma/MOM_parameter_doc.layout | 2 +- ocean_only/flow_downslope/z/MOM_parameter_doc.layout | 2 +- ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 2 +- ocean_only/global_ALE/hycom/MOM_parameter_doc.layout | 2 +- ocean_only/global_ALE/layer/MOM_parameter_doc.all | 2 +- ocean_only/global_ALE/layer/MOM_parameter_doc.layout | 2 +- ocean_only/global_ALE/z/MOM_parameter_doc.all | 2 +- ocean_only/global_ALE/z/MOM_parameter_doc.layout | 2 +- ocean_only/lock_exchange/MOM_parameter_doc.layout | 2 +- ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.layout | 2 +- ocean_only/nonBous_global/MOM_parameter_doc.all | 2 +- ocean_only/nonBous_global/MOM_parameter_doc.layout | 2 +- ocean_only/resting/layer/MOM_parameter_doc.layout | 2 +- ocean_only/resting/z/MOM_parameter_doc.layout | 2 +- ocean_only/seamount/layer/MOM_parameter_doc.layout | 2 +- ocean_only/seamount/rho/MOM_parameter_doc.layout | 2 +- ocean_only/seamount/sigma/MOM_parameter_doc.layout | 2 +- ocean_only/seamount/z/MOM_parameter_doc.layout | 2 +- ocean_only/single_column/BML/MOM_parameter_doc.layout | 2 +- ocean_only/single_column/EPBL/MOM_parameter_doc.layout | 2 +- ocean_only/single_column/KPP/MOM_parameter_doc.layout | 2 +- ocean_only/sloshing/layer/MOM_parameter_doc.layout | 2 +- ocean_only/sloshing/rho/MOM_parameter_doc.layout | 2 +- ocean_only/sloshing/z/MOM_parameter_doc.layout | 2 +- ocean_only/torus_advection_test/MOM_parameter_doc.layout | 2 +- ocean_only/tracer_mixing/rho/MOM_parameter_doc.layout | 2 +- ocean_only/tracer_mixing/z/MOM_parameter_doc.layout | 2 +- ocean_only/unit_tests/MOM_parameter_doc.layout | 2 +- src/MOM6 | 2 +- 82 files changed, 83 insertions(+), 83 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 index e748458008..a2b2e0cd32 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 e64d4b4108..eded439aaf 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 e748458008..a2b2e0cd32 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 bc305964ba..c4c05eaba4 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 cf07bbfb99..224828ea5c 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 e748458008..a2b2e0cd32 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 bc305964ba..c4c05eaba4 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 cf07bbfb99..224828ea5c 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 152219e792..7c40e01ac9 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 f44320f1d3..f3ba794c4d 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 c0975e5eb4..a4bb66e24a 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 152219e792..7c40e01ac9 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 11b39d1776..e21d69d6a5 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 9092ef0245..5499d8c882 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 ac06a0f462..07d03ed49d 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 1f380e3738..655ec0b6cb 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 7e42947b32..2aa47c42c5 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 11ffedf908..cb6a723564 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 a0564eac6b..df03b41542 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 a6b353b0b4..436338d42e 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 6b1021fa76..c278699b51 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 bb47bdac1a..d8d452cf54 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 ea97f029ea..77e518070e 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 e748458008..a2b2e0cd32 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 cf07bbfb99..224828ea5c 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 e748458008..a2b2e0cd32 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 cf07bbfb99..224828ea5c 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 e748458008..a2b2e0cd32 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 cf07bbfb99..224828ea5c 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 d0bf972496..52bbdb2d42 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 d0bf972496..52bbdb2d42 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 d0bf972496..52bbdb2d42 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 d0bf972496..52bbdb2d42 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 d0bf972496..52bbdb2d42 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 d0bf972496..52bbdb2d42 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 d0bf972496..52bbdb2d42 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 d0bf972496..52bbdb2d42 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 d0bf972496..52bbdb2d42 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 d0bf972496..52bbdb2d42 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 d0bf972496..52bbdb2d42 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 d0bf972496..52bbdb2d42 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 638d9b5a82..f53725906d 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 98cdd53bc0..8b14129574 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 d0bf972496..52bbdb2d42 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 52683bc4e0..126209f1b8 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 52683bc4e0..126209f1b8 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 52683bc4e0..126209f1b8 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 596b61eefb..1c36d1299b 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 062bfa9138..2d88554587 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 7416d98eee..b02309ece1 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 52683bc4e0..126209f1b8 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 52683bc4e0..126209f1b8 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 52683bc4e0..126209f1b8 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 52683bc4e0..126209f1b8 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 52683bc4e0..126209f1b8 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 3a92323d81..7fed2921dc 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 a53da7a137..2402696ab7 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 e3cd651f88..48275cdb07 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 a53da7a137..2402696ab7 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 d79eb5c2e2..a8c5c09d97 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 a53da7a137..2402696ab7 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 52683bc4e0..126209f1b8 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 062bfa9138..2d88554587 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 c053133b6d..ac7ebb8953 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 e748458008..a2b2e0cd32 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 55a9c3cfd9..3b8e9dbfb1 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 55a9c3cfd9..3b8e9dbfb1 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 55a9c3cfd9..3b8e9dbfb1 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 55a9c3cfd9..3b8e9dbfb1 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 55a9c3cfd9..3b8e9dbfb1 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 55a9c3cfd9..3b8e9dbfb1 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 d0bf972496..52bbdb2d42 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 d0bf972496..52bbdb2d42 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 d0bf972496..52bbdb2d42 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 55a9c3cfd9..3b8e9dbfb1 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 55a9c3cfd9..3b8e9dbfb1 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 55a9c3cfd9..3b8e9dbfb1 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 062bfa9138..2d88554587 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 52683bc4e0..126209f1b8 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 52683bc4e0..126209f1b8 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 d0bf972496..52bbdb2d42 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 d8a270b6e8..7ca5ed9f2c 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit d8a270b6e815a9053103dea7ac2fd3980b1327d1 +Subproject commit 7ca5ed9f2c233a19ce68801ee92558cf2e9638eb