Skip to content

Commit

Permalink
MOM6: Correct the computation of FrictWork in MOM_hor_visc
Browse files Browse the repository at this point in the history
- NOAA-GFDL/MOM6@f79879687 Correct the computation of FrictWork in MOM_hor_visc
  • Loading branch information
mom6bot authored and marshallward committed Jun 21, 2024
1 parent 68fc864 commit 1eaf624
Show file tree
Hide file tree
Showing 62 changed files with 245 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 1eaf624

Please sign in to comment.