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 f98321d1c..e0aea6a84 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 @@ -1186,6 +1186,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 20181231 ! default = 20181231 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 47272b9f9..7894f9503 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 @@ -1186,6 +1186,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 df1821afd..d2df7e732 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 @@ -1186,6 +1186,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 5f1254171..98e0d656e 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1186,6 +1186,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 4498d0bb1..e137837aa 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 @@ -1397,6 +1397,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 05386b1de..d81a01a6e 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -1421,6 +1421,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 20181231 ! default = 20181231 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 cf831828f..3b8846437 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -1440,6 +1440,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 20181231 ! default = 20181231 diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 62b2530d8..d4ec994d7 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1421,6 +1421,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 20181231 ! default = 20181231 diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index e30269e98..5b7ef5611 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1440,6 +1440,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 20181231 ! default = 20181231 diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index 8aba3a63d..4eee4d902 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -1417,6 +1417,10 @@ USE_KH_BG_2D = True ! [Boolean] default = False KH_BG_2D_BUG = False ! [Boolean] default = False ! If true, retain an answer-changing horizontal indexing bug in setting the ! corner-point viscosities when USE_KH_BG_2D=True. This is not recommended. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. KH_BG_2D_FILENAME = "KH_background_2d.nc" ! default = "KH_background_2d.nc" ! The filename containing a 2d map of "Kh". KH_BG_2D_VARNAME = "Kh" ! default = "Kh" diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index f81687885..cdccaaafa 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1152,6 +1152,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 ade1d1b99..1fcd49e8f 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1152,6 +1152,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index d14a4ae72..286630504 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1152,6 +1152,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 eb63d7d60..1e715a638 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 @@ -891,6 +891,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 150c3df70..187e8f71a 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 @@ -1003,6 +1003,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 5e29faed9..2dc5cc741 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 @@ -1003,6 +1003,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 2a1e86411..74bb0c33b 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 @@ -891,6 +891,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 2ef91bcdf..b849a401b 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 @@ -1003,6 +1003,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 5f509cace..3b2f717bc 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 @@ -1003,6 +1003,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 ef0b1f8f9..acd07de5d 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 @@ -891,6 +891,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 d123ae2b6..44348cb99 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 @@ -1003,6 +1003,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 ca768b57b..afcc44093 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 @@ -1003,6 +1003,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 4cd86fbf5..230476a51 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 @@ -891,6 +891,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 76c990223..677a593e7 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 @@ -1003,6 +1003,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 731202a37..29bd71233 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 @@ -1003,6 +1003,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index dc853bdfd..bbac41107 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -959,6 +959,10 @@ USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = True HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the viscosity bounds to the ! theoretical maximum for stability without considering other terms. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index 7e45c1b25..aafb711a0 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -896,6 +896,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the viscosity bounds to the ! theoretical maximum for stability without considering other terms. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 77b76c0d8..cb1b68daa 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -1003,6 +1003,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 7689b6554..d9a85f594 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -968,6 +968,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 8b1c3e288..03692a292 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -1125,6 +1125,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 3703e29ec..c73f39b24 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -1077,6 +1077,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index cbdcf03a9..8b65d2690 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -1061,6 +1061,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the viscosity bounds to the ! theoretical maximum for stability without considering other terms. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 15352aeb4..66b5ef768 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -1020,6 +1020,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 5c5bd9b43..5dd0b3088 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -851,6 +851,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 079ee7e31..8aed6bb76 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -952,6 +952,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index a882bbca7..34396744d 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -965,6 +965,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index a821ba9d1..08e122150 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -1124,6 +1124,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 9563f6021..33b929965 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -1076,6 +1076,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index ce1671afa..622634c5c 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -1076,6 +1076,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 6fc4640c7..2bee0fca5 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1447,6 +1447,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 06152829f..9537094e0 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1342,6 +1342,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 285e31a7b..974b8ac7c 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1394,6 +1394,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index d2fbcdacc..f07be9955 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -955,6 +955,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 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 e1d589498..35e7d3bbb 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -1061,6 +1061,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index cb8cab5d4..afbb38e7a 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1165,6 +1165,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === DIRECT_STRESS = False ! [Boolean] default = False diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index bf7958b75..2fe7e148b 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -950,6 +950,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index f373e7bab..13379195d 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -1061,6 +1061,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index ced49ae39..671b5f365 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -983,6 +983,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 63c3c7b55..5843c25da 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -1140,6 +1140,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index fc5b45c56..7b6b69eef 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -1089,6 +1089,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 722ec7bda..47180dcf7 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -1089,6 +1089,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index e029c6e80..2fe395f81 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -922,6 +922,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 1796503fa..b983294ef 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -981,6 +981,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index 45ca91867..345ff032d 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -981,6 +981,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True ! If true, use the land mask for the computation of thicknesses at velocity ! locations. This eliminates the dependence on arbitrary values over land or ! outside of the domain. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 175acb620..b096c2d1f 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -966,6 +966,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index b31999fe3..112f1a662 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -1125,6 +1125,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 1c5db7491..dc5d4cada 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -1077,6 +1077,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index b9fdd9e32..94a829c83 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -944,6 +944,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 0ed27c955..f16bb6655 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -1126,6 +1126,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index ef856daec..66d9a8c57 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -1078,6 +1078,10 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic viscosities. The final ! viscosity is the maximum of the other terms and this background value. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 99991231 ! default = 99991231 diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index 60b6e41f1..1f7d97afd 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -792,6 +792,10 @@ USE_LAND_MASK_FOR_HVISC = True ! [Boolean] default = True HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the viscosity bounds to the ! theoretical maximum for stability without considering other terms. +FRICTWORK_BUG = True ! [Boolean] default = True + ! If true, retain an answer-changing bug in calculating the FrictWork, which + ! cancels the h in thickness flux and the h at velocity point. This isnot + ! recommended. ! === module MOM_vert_friction === VERT_FRICTION_ANSWER_DATE = 20181231 ! default = 20181231 diff --git a/src/MOM6 b/src/MOM6 index 36dda7e4e..f79879687 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 36dda7e4ec1a1ca7b17b4d83feda336803a9b2f1 +Subproject commit f798796872a618d5179f6360984119b026d0e316