Skip to content

Commit

Permalink
Merge branch 'main' into dev/gfdl after gfdl-to-main-2024-05-16
Browse files Browse the repository at this point in the history
  • Loading branch information
@adcroft
adcroft committed Jul 31, 2024
2 parents f33dc4f + 2661617 commit b44fbd3
Show file tree
Hide file tree
Showing 32 changed files with 121 additions and 2 deletions.
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 @@ -2199,6 +2199,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 @@ -2275,6 +2275,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 @@ -2294,6 +2294,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 @@ -2275,6 +2275,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 @@ -2294,6 +2294,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 @@ -2237,6 +2237,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 @@ -1345,6 +1345,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 @@ -1457,6 +1457,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 @@ -1457,6 +1457,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 @@ -1345,6 +1345,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 @@ -1457,6 +1457,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 @@ -1457,6 +1457,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 @@ -1345,6 +1345,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 @@ -1457,6 +1457,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 @@ -1457,6 +1457,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 @@ -1345,6 +1345,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 @@ -1457,6 +1457,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 @@ -1457,6 +1457,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 @@ -1464,6 +1464,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 @@ -1457,6 +1457,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 @@ -1529,6 +1529,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 @@ -2249,6 +2249,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 @@ -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 ocean_only/global_ALE/z/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2196,6 +2196,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 @@ -1463,6 +1463,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 b44fbd3

Please sign in to comment.