Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MOM6+SIS2+icebergs: Response to the code review #396

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = True ! [Boolean] default = True
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False

! === module MOM_PressureForce_FV ===

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
LAPLACIAN = True ! [Boolean] default = False
! If true, use a Laplacian horizontal viscosity.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False

! === module MOM_PressureForce_FV ===

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
LAPLACIAN = True ! [Boolean] default = False
! If true, use a Laplacian horizontal viscosity.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False

! === module MOM_PressureForce_FV ===

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
LAPLACIAN = True ! [Boolean] default = False
! If true, use a Laplacian horizontal viscosity.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False

! === module MOM_PressureForce_FV ===

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
LAPLACIAN = True ! [Boolean] default = False
! If true, use a Laplacian horizontal viscosity.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1287,6 +1287,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
LAPLACIAN = True ! [Boolean] default = False
! If true, use a Laplacian horizontal viscosity.
Expand Down
5 changes: 5 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 @@ -1302,6 +1302,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = True ! [Boolean] default = True
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
LAPLACIAN = True ! [Boolean] default = False
! If true, use a Laplacian horizontal viscosity.
Expand Down
5 changes: 5 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 @@ -1315,6 +1315,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = True ! [Boolean] default = True
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
LAPLACIAN = True ! [Boolean] default = False
! If true, use a Laplacian horizontal viscosity.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1302,6 +1302,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = True ! [Boolean] default = True
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
LAPLACIAN = True ! [Boolean] default = False
! If true, use a Laplacian horizontal viscosity.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1315,6 +1315,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = True ! [Boolean] default = True
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
LAPLACIAN = True ! [Boolean] default = False
! If true, use a Laplacian horizontal viscosity.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1293,6 +1293,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = True ! [Boolean] default = True
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,8 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False
! If true, use mass weighting when interpolating T/S for integrals near the
! bathymetry in FV pressure gradient calculations.

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
LAPLACIAN = True ! [Boolean] default = False
! If true, use a Laplacian horizontal viscosity.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1044,6 +1044,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False

! === module MOM_PressureForce_FV ===

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
LAPLACIAN = True ! [Boolean] default = False
! If true, use a Laplacian horizontal viscosity.
Expand Down
5 changes: 5 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 @@ -1044,6 +1044,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False

! === module MOM_PressureForce_FV ===

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
LAPLACIAN = True ! [Boolean] default = False
! If true, use a Laplacian horizontal viscosity.
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1044,6 +1044,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False

! === module MOM_PressureForce_FV ===

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
LAPLACIAN = True ! [Boolean] default = False
! If true, use a Laplacian horizontal viscosity.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -881,6 +881,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False

! === module MOM_PressureForce_FV ===

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
BIHARMONIC = False ! [Boolean] default = True
! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False

! === module MOM_PressureForce_FV ===

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
BIHARMONIC = False ! [Boolean] default = True
! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False

! === module MOM_PressureForce_FV ===

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
BIHARMONIC = False ! [Boolean] default = True
! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -881,6 +881,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False

! === module MOM_PressureForce_FV ===

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
BIHARMONIC = False ! [Boolean] default = True
! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,11 @@ BOUNDARY_EXTRAPOLATION_PRESSURE = True ! [Boolean] default = True
USE_STANLEY_PGF = False ! [Boolean] default = False
! If true, turn on Stanley SGS T variance parameterization in PGF code.

! === module MOM_Zanna_Bolton ===
USE_ZB2020 = False ! [Boolean] default = False
! If true, turns on Zanna-Bolton-2020 (ZB) subgrid momentum parameterization of
! mesoscale eddies.

! === module MOM_hor_visc ===
HOR_VISC_2018_ANSWERS = False ! [Boolean] default = False
! If true, use the order of arithmetic and expressions that recover the answers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,8 @@ BOUND_CORIOLIS = True ! [Boolean] default = False

! === module MOM_PressureForce_FV ===

! === module MOM_Zanna_Bolton ===

! === module MOM_hor_visc ===
BIHARMONIC = False ! [Boolean] default = True
! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with
Expand Down
Loading