From 62e42718453b287dbcc8029f096bbbf05f9fa4c9 Mon Sep 17 00:00:00 2001 From: MOM6 bot Date: Tue, 26 Mar 2024 10:07:01 -0400 Subject: [PATCH] MOM6: fix opemmp parallel - NOAA-GFDL/MOM6@37ff301a6 fix opemmp parallel - NOAA-GFDL/MOM6@812510bc4 Add an option in hor_visc to use cont thickness --- coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 3 +++ coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all | 3 +++ .../Intersperse_ice_1deg/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 3 +++ .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 3 +++ .../CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all | 3 +++ .../CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all | 3 +++ .../CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all | 3 +++ ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all | 3 +++ .../CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all | 3 +++ ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all | 3 +++ .../skin_warming_wind/BML/MOM_parameter_doc.all | 3 +++ .../skin_warming_wind/EPBL/MOM_parameter_doc.all | 3 +++ .../skin_warming_wind/KPP/MOM_parameter_doc.all | 3 +++ ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all | 3 +++ .../CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all | 3 +++ ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all | 3 +++ ocean_only/DOME/MOM_parameter_doc.all | 3 +++ ocean_only/Phillips_2layer/MOM_parameter_doc.all | 3 +++ ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all | 3 +++ ocean_only/adjustment2d/layer/MOM_parameter_doc.all | 3 +++ ocean_only/adjustment2d/rho/MOM_parameter_doc.all | 3 +++ ocean_only/adjustment2d/z/MOM_parameter_doc.all | 3 +++ ocean_only/benchmark/MOM_parameter_doc.all | 3 +++ ocean_only/circle_obcs/MOM_parameter_doc.all | 3 +++ ocean_only/double_gyre/MOM_parameter_doc.all | 3 +++ ocean_only/external_gwave/MOM_parameter_doc.all | 3 +++ ocean_only/flow_downslope/layer/MOM_parameter_doc.all | 3 +++ ocean_only/flow_downslope/rho/MOM_parameter_doc.all | 3 +++ ocean_only/flow_downslope/sigma/MOM_parameter_doc.all | 3 +++ ocean_only/flow_downslope/z/MOM_parameter_doc.all | 3 +++ ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 3 +++ ocean_only/global_ALE/layer/MOM_parameter_doc.all | 3 +++ ocean_only/global_ALE/z/MOM_parameter_doc.all | 3 +++ ocean_only/lock_exchange/MOM_parameter_doc.all | 3 +++ ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all | 3 +++ ocean_only/nonBous_global/MOM_parameter_doc.all | 3 +++ ocean_only/resting/layer/MOM_parameter_doc.all | 3 +++ ocean_only/resting/z/MOM_parameter_doc.all | 3 +++ ocean_only/seamount/layer/MOM_parameter_doc.all | 3 +++ ocean_only/seamount/rho/MOM_parameter_doc.all | 3 +++ ocean_only/seamount/sigma/MOM_parameter_doc.all | 3 +++ ocean_only/seamount/z/MOM_parameter_doc.all | 3 +++ ocean_only/single_column/BML/MOM_parameter_doc.all | 3 +++ ocean_only/single_column/EPBL/MOM_parameter_doc.all | 3 +++ ocean_only/single_column/KPP/MOM_parameter_doc.all | 3 +++ ocean_only/sloshing/layer/MOM_parameter_doc.all | 3 +++ ocean_only/sloshing/rho/MOM_parameter_doc.all | 3 +++ ocean_only/sloshing/z/MOM_parameter_doc.all | 3 +++ ocean_only/torus_advection_test/MOM_parameter_doc.all | 3 +++ ocean_only/tracer_mixing/rho/MOM_parameter_doc.all | 3 +++ ocean_only/tracer_mixing/z/MOM_parameter_doc.all | 3 +++ ocean_only/unit_tests/MOM_parameter_doc.all | 3 +++ src/MOM6 | 2 +- 62 files changed, 184 insertions(+), 1 deletion(-) diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 0a19d7f2b..cf4e0e364 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -1079,6 +1079,9 @@ HOR_VISC_ANSWER_DATE = 20181231 ! default = 20181231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index 1fc9c7ee1..960db6045 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -1079,6 +1079,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all index 260bdba8c..de5f9346f 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all @@ -1079,6 +1079,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 234c6df44..4dfe99d1a 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1079,6 +1079,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 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 4b2fdc3ea..a49406633 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 @@ -1290,6 +1290,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all index 6287f542e..bd9de337b 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -1314,6 +1314,9 @@ HOR_VISC_ANSWER_DATE = 20181231 ! default = 20181231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all index 9f20631ac..a6c09511e 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -1328,6 +1328,9 @@ HOR_VISC_ANSWER_DATE = 20181231 ! default = 20181231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index bc08f551b..ed6a2f102 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1314,6 +1314,9 @@ HOR_VISC_ANSWER_DATE = 20181231 ! default = 20181231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 31ce50b42..575dab3db 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1328,6 +1328,9 @@ HOR_VISC_ANSWER_DATE = 20181231 ! default = 20181231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index bce04174e..d82ea946c 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -1305,6 +1305,9 @@ HOR_VISC_ANSWER_DATE = 20181231 ! default = 20181231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 4dc98c4e8..98c928284 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1051,6 +1051,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 43fed8af0..9abe82be9 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1051,6 +1051,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 2082f4886..d584768f1 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1051,6 +1051,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all index 60ccb56c5..37e7043d0 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all @@ -873,6 +873,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all index 071546874..8f0ef469e 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all @@ -982,6 +982,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all index f15df8398..6f6b5c069 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all @@ -982,6 +982,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all index d15e04641..b525ecbdb 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all @@ -873,6 +873,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all index 9f439eb7f..46cea16b0 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all @@ -982,6 +982,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all index 2406cd247..2dd038e65 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all @@ -982,6 +982,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all index 441d7c6ef..eae80f30a 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all @@ -873,6 +873,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all index 3069a0bf6..4cb6772c0 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all @@ -982,6 +982,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all index 311058abe..d4a28a620 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all @@ -982,6 +982,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all index 543eba8fa..af2e1d95b 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all @@ -873,6 +873,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all index 6e5bac119..553cc24d3 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all @@ -982,6 +982,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all index 6cb4b3e1c..eba152f00 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all @@ -982,6 +982,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index d264f5ed7..f2fccf1fe 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -893,6 +893,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = True ! [Boolean] default = True diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index 2f18c6b5f..b3cb947cf 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -830,6 +830,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = True ! [Boolean] default = True diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 49982e02e..329bd46ff 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -982,6 +982,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 60d0e8f03..77ba2a8f9 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -906,6 +906,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 05a384ccf..3facad1b6 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -1060,6 +1060,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 6281a3396..dadee6e1d 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -1012,6 +1012,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index cc8f824a6..0018d694a 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -995,6 +995,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = True ! [Boolean] default = True diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index fdf439cf8..46f2bfc3a 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -917,6 +917,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 25.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 4d49145d4..9dc03e6f3 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -789,6 +789,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 1.0E+04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index cfc20e43d..da0c75cf9 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -895,6 +895,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.01 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 192924876..3a8791b5e 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -905,6 +905,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 1.0E+04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index bdcf8035d..cc3121b60 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -1061,6 +1061,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 1.0E+04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 8d46f0522..d3b695a76 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -1013,6 +1013,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 1.0E+04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 9a601a906..8231e670e 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -1013,6 +1013,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 1.0E+04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 6af0fded1..6d6b0ced5 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1340,6 +1340,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 070d986a5..ede621fe8 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1232,6 +1232,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 219394bfe..79fb99f33 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1287,6 +1287,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index be4088703..e25803615 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -898,6 +898,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.01 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all index 72604ae79..409779c7e 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -998,6 +998,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 1.0E+04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index b5aec01b3..29fb37573 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1064,6 +1064,9 @@ USE_ZB2020 = False ! [Boolean] default = False ! mesoscale eddies. ! === module MOM_hor_visc === +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index f9597d252..7652a800c 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -890,6 +890,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 1.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index d8e5570c8..ee946de45 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -998,6 +998,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 1.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index f4ec7a252..4188bab51 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -923,6 +923,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 1000.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index b29e5dae3..b8fd8d9dd 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -1077,6 +1077,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 1000.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 72d78b60f..125521105 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -1026,6 +1026,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 1000.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 244b554f1..adafce622 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -1026,6 +1026,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 1000.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index a9cd7878e..1447e9166 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -898,6 +898,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 939f24379..290869901 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -960,6 +960,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index b815bf630..5da280590 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -960,6 +960,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = False ! [Boolean] default = True diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 6104ec16f..5286f84e6 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -904,6 +904,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 8eff5581e..771d6fa38 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -1060,6 +1060,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index fea9d1884..24891b505 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -1012,6 +1012,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index cf0a43b74..fb427dcf2 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -887,6 +887,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.01 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 4996cf504..9767fc2cc 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -1061,6 +1061,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index 777602dae..82f191515 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -1013,6 +1013,9 @@ HOR_VISC_ANSWER_DATE = 99991231 ! default = 99991231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. KH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index 97feaf115..8fc3afdad 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -749,6 +749,9 @@ HOR_VISC_ANSWER_DATE = 20181231 ! default = 20181231 ! viscosity calculations. Values below 20190101 recover the answers from the ! end of 2018, while higher values use updated and more robust forms of the same ! expressions. +USE_CONT_THICKNESS = False ! [Boolean] default = False + ! If true, use thickness at velocity points from continuity solver. This + ! optioncurrently only works with split mode. LAPLACIAN = False ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. BIHARMONIC = True ! [Boolean] default = True diff --git a/src/MOM6 b/src/MOM6 index 32f631623..37ff301a6 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 32f631623eccfc88a4d3dd0c97001dc5eeef4cc2 +Subproject commit 37ff301a65817e7212cd7743c66fb406fc2b9223