Skip to content

Commit

Permalink
MOM6: +Add optional argument du_cor to continuity_PPM
Browse files Browse the repository at this point in the history
- NOAA-GFDL/MOM6@78772923d +Add optional argument du_cor to continuity_PPM
- NOAA-GFDL/MOM6@6b6f8dcde Move continuity_fluxes to MOM_continuity_PPM.F90
- NOAA-GFDL/MOM6@a70482cfc +Add continuity_zonal_convergence
- NOAA-GFDL/MOM6@bbda30f12 +Add zonal_BT_mass_flux & meridional_BT_mass_flux
- NOAA-GFDL/MOM6@d3496fee3 +Call zonal_edge_thickness outside of zonal_mass_flux
- NOAA-GFDL/MOM6@6b86ab84d +Create zonal_edge_thickness in MOM_continuity_PPM
- NOAA-GFDL/MOM6@fc0bef1c2 +Pass-through from continuity_PPM via continuity
- NOAA-GFDL/MOM6@b898297e0 +(*)Add continuity_fluxes & continuity_adjust_vel
- NOAA-GFDL/MOM6@11759d6a2 Fix unpaired parentheses in a formatting string
- NOAA-GFDL/MOM6@34b880faa Add units to comments in MOM_neutral_diffusion
- NOAA-GFDL/MOM6@7cc191a6f Add rule and workflow to compare results of micro-timing tests
- NOAA-GFDL/MOM6@d8579d292 Use a class to deliver elemental procedures for EOS
- NOAA-GFDL/MOM6@cce4b3da5 Fix a bug that left OBC%debug uninitialized
  • Loading branch information
mom6bot authored and marshallward committed Dec 14, 2023
1 parent 40e3937 commit e040565
Show file tree
Hide file tree
Showing 123 changed files with 1 addition and 550 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -952,13 +952,6 @@ STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,6 @@ PORBAR_ANSWER_DATE = 99991231 ! default = 20181231

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09
! The tolerance for the differences between the barotropic and baroclinic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -952,13 +952,6 @@ STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,6 @@ KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09
! The tolerance for the differences between the barotropic and baroclinic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -952,13 +952,6 @@ STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,6 @@ KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09
! The tolerance for the differences between the barotropic and baroclinic
Expand Down
7 changes: 0 additions & 7 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -952,13 +952,6 @@ STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
2 changes: 0 additions & 2 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,6 @@ KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09
! The tolerance for the differences between the barotropic and baroclinic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1093,13 +1093,6 @@ STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,6 @@ KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0
TIDES = True ! [Boolean] default = False
! If true, apply tidal momentum forcing.

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
ETA_TOLERANCE = 1.0E-06 ! [m] default = 2.5E-09
! The tolerance for the differences between the barotropic and baroclinic
Expand Down
7 changes: 0 additions & 7 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1187,13 +1187,6 @@ STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
2 changes: 0 additions & 2 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,6 @@ PORBAR_ANSWER_DATE = 99991231 ! default = 20181231

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.75E-09
! The tolerance for the differences between the barotropic and baroclinic
Expand Down
7 changes: 0 additions & 7 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1201,13 +1201,6 @@ STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
2 changes: 0 additions & 2 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,6 @@ PORBAR_ANSWER_DATE = 99991231 ! default = 20181231

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.75E-09
! The tolerance for the differences between the barotropic and baroclinic
Expand Down
7 changes: 0 additions & 7 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1187,13 +1187,6 @@ STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
2 changes: 0 additions & 2 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,6 @@ PORBAR_ANSWER_DATE = 99991231 ! default = 20181231

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.75E-09
! The tolerance for the differences between the barotropic and baroclinic
Expand Down
7 changes: 0 additions & 7 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1201,13 +1201,6 @@ STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
2 changes: 0 additions & 2 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -414,8 +414,6 @@ PORBAR_ANSWER_DATE = 99991231 ! default = 20181231

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.75E-09
! The tolerance for the differences between the barotropic and baroclinic
Expand Down
7 changes: 0 additions & 7 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -1178,13 +1178,6 @@ STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
2 changes: 0 additions & 2 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,6 @@ PORBAR_ANSWER_DATE = 99991231 ! default = 20181231

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.75E-09
! The tolerance for the differences between the barotropic and baroclinic
Expand Down
7 changes: 0 additions & 7 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -924,13 +924,6 @@ STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
2 changes: 0 additions & 2 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,6 @@ KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09
! The tolerance for the differences between the barotropic and baroclinic
Expand Down
7 changes: 0 additions & 7 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -924,13 +924,6 @@ STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
2 changes: 0 additions & 2 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,6 @@ KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09
! The tolerance for the differences between the barotropic and baroclinic
Expand Down
7 changes: 0 additions & 7 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -924,13 +924,6 @@ STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True
FPMIX = False ! [Boolean] default = False
! If true, apply profiles of momentum flux magnitude and direction

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
2 changes: 0 additions & 2 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,6 @@ KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0

! === module MOM_dynamics_split_RK2 ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09
! The tolerance for the differences between the barotropic and baroclinic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -753,13 +753,6 @@ TIDES = False ! [Boolean] default = False
CALCULATE_SAL = False ! [Boolean] default = False
! If true, calculate self-attraction and loading.

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,6 @@ KV = 0.0 ! [m2 s-1]

! === module MOM_dynamics_unsplit ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
UPWIND_1ST_CONTINUITY = True ! [Boolean] default = False
! If true, CONTINUITY_PPM becomes a 1st-order upwind continuity solver. This
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -862,13 +862,6 @@ TIDES = False ! [Boolean] default = False
CALCULATE_SAL = False ! [Boolean] default = False
! If true, calculate self-attraction and loading.

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,6 @@ KV = 0.0 ! [m2 s-1]

! === module MOM_dynamics_unsplit ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
UPWIND_1ST_CONTINUITY = True ! [Boolean] default = False
! If true, CONTINUITY_PPM becomes a 1st-order upwind continuity solver. This
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -862,13 +862,6 @@ TIDES = False ! [Boolean] default = False
CALCULATE_SAL = False ! [Boolean] default = False
! If true, calculate self-attraction and loading.

! === module MOM_continuity ===
CONTINUITY_SCHEME = "PPM" ! default = "PPM"
! CONTINUITY_SCHEME selects the discretization for the continuity solver. The
! only valid value currently is:
! PPM - use a positive-definite (or monotonic)
! piecewise parabolic reconstruction solver.

! === module MOM_continuity_PPM ===
MONOTONIC_CONTINUITY = False ! [Boolean] default = False
! If true, CONTINUITY_PPM uses the Colella and Woodward monotonic limiter. The
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,6 @@ KV = 0.0 ! [m2 s-1]

! === module MOM_dynamics_unsplit ===

! === module MOM_continuity ===

! === module MOM_continuity_PPM ===
UPWIND_1ST_CONTINUITY = True ! [Boolean] default = False
! If true, CONTINUITY_PPM becomes a 1st-order upwind continuity solver. This
Expand Down
Loading

0 comments on commit e040565

Please sign in to comment.