Skip to content

MOM6: Add floor to "h_marg" in continuity_PPM #569

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.

Sign up for GitHub

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

Merged
Hallberg-NOAA merged 1 commit into from
Dec 8, 2025
Merged

MOM6: Add floor to "h_marg" in continuity_PPM #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,6 +1382,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,6 +1396,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1369,6 +1369,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1361,6 +1361,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,6 +1382,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,6 +1396,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,6 +1373,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,9 @@ CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True
! If true, use the marginal face areas from the continuity solver for use as the
! weights in the barotropic solver. Otherwise use the transport averaged areas.
CONT_USE_H_MARG_MIN = False ! [Boolean] default = False
! If true, the marginal thickness used and returned from continuity is bounded
! from below by a sub-roundoff value. Otherwise the minimum is 0.

! === module MOM_CoriolisAdv ===
NOSLIP = False ! [Boolean] default = False
Expand Down
Loading