Skip to content

Commit

Permalink
MOM6: updating after patches on gfdl-to-main-2024-05-31
Browse files Browse the repository at this point in the history 
3fac1c5ab Updates doc files with parameter USE_HUYNH_STENCIL_BUG

- NOAA-GFDL/MOM6@3fac1c5ab Allow incorrect PPM:H3 tracer advection stencil
- NOAA-GFDL/MOM6@ac2b642f4 Re-initialize fields within KPP
- NOAA-GFDL/MOM6@b4ae2b752 Disable nonrepro FMAs in convex BBL solver
- NOAA-GFDL/MOM6@0578393e4 Remove diag_send_complete from disable_averaging
  • Loading branch information
@adcroft
adcroft committed Jul 29, 2024
1 parent 982b75b commit bd19f25
Show file tree
Hide file tree
Showing 31 changed files with 120 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,6 @@ seaice.stats.*
*.ignore
# Ignore lcov files
lcov.*

# Ignore make include files
*.mk
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2123,6 +2123,10 @@ TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2216,6 +2216,10 @@ TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 0.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2235,6 +2235,10 @@ TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 50.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2216,6 +2216,10 @@ TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 0.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2235,6 +2235,10 @@ TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 50.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2178,6 +2178,10 @@ TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 0.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1326,6 +1326,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1326,6 +1326,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1326,6 +1326,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1326,6 +1326,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/DOME/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1426,6 +1426,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 0.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/circle_obcs/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1484,6 +1484,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 0.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/global_ALE/hycom/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2173,6 +2173,10 @@ TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/global_ALE/layer/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2050,6 +2050,10 @@ TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/global_ALE/z/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2120,6 +2120,10 @@ TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
4 changes: 4 additions & 0 deletions ocean_only/single_column/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1438,6 +1438,10 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)
USE_HUYNH_STENCIL_BUG = False ! [Boolean] default = False
! If true, use a stencil width of 2 in PPM:H3 tracer advection. This is
! incorrect and will produce regressions in certain configurations, but may be
! required to reproduce results in legacy simulations.

! === module MOM_tracer_hor_diff ===
KHTR = 600.0 ! [m2 s-1] default = 0.0
Expand Down
Loading

0 comments on commit bd19f25

Please sign in to comment.