diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 4496a058f..45af20aa5 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -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 diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index e7cdd2389..749b29a2b 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -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 diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all index e0e83bc43..9bf533fe1 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 62a56fcbf..f725db658 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all index 8d8e5716c..1e9b816e0 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all index 082c49204..decceb57e 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all index 26f235738..4494029c6 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all index c21abbac6..8b643941b 100644 --- a/ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all index 74eadccb4..f589585dc 100644 --- a/ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 5e9274fe1..26bb88707 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 8f497b899..22f2ff312 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index a97137c15..d22d6d0c6 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index e4e600ae4..3d6230fd8 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 3b86b7396..65384a669 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -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 diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 289d4f046..a892850a3 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all index 775899565..c1a9a21c5 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all index 3e0e26407..f05736409 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all index 136654c7c..8cbc75389 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all index 21d015611..c3e9d053e 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all index 1453b19e8..f375a2ff6 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all index 1bf28441b..5cf3811c1 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all index 790933904..27563cabb 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all index 621afc2bb..73d2cf2b0 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all index e5ee03b4a..ac3c89018 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all index dbc0b13a5..51fa1f98c 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all index 3766d690a..ebc166dfd 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all index c8c18d190..7e34b2029 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index a38e43f1f..8d52fadf9 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -949,6 +949,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 diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index 94e571a40..5f38b2c34 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -855,6 +855,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 diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index b78208fc7..d5ef21b36 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 177e06f5e..ba20d0742 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -918,6 +918,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 diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 49cb9d54d..0254c2812 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -1101,6 +1101,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 diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 5404652de..7abcc0e05 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 0b0e543f7..271938968 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -997,6 +997,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 diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 2cfbebc18..eacc391fe 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -953,6 +953,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 diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index d9da7e421..65d9dbd86 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -780,6 +780,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 diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index ee20416f4..c846c17c8 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -907,6 +907,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 diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 68aac10b1..cea38a26a 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -917,6 +917,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 diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index 13b36eb5c..ffec4fd5b 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -1102,6 +1102,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 diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 7eeddc0e4..badc2db06 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -1054,6 +1054,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 diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index de1ec05c5..2e26c8ac8 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -1054,6 +1054,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 diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index a211e8ffa..b4e6c05b9 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1321,6 +1321,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 diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 490962fe8..8137c6f06 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1175,6 +1175,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 diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index e2e18d3b2..caf8463f3 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1261,6 +1261,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 diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 48247b9a5..f80d32978 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -910,6 +910,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 diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all index d131272c5..d940fcc73 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -1039,6 +1039,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 diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index c16f7e094..74574ba2d 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1005,6 +1005,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 diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index ec3d3301c..f7e196a46 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -902,6 +902,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 diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index e847a411c..7c3ca1de8 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -1039,6 +1039,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 diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index f7fc8f851..856d81ff3 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -935,6 +935,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 diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 7acb9107e..6b749ce0b 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -1118,6 +1118,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 diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 12e63ce70..9dc687592 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -1067,6 +1067,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 diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 0ed2df9ae..5e68bf8ce 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -1067,6 +1067,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 diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index bb45f991a..dbd3a0a60 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -875,6 +875,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 diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 754f7c81b..fccb975e7 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -968,6 +968,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 diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index 2b5cc3bd5..8952aa1a5 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -968,6 +968,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 diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index a1951a3d3..4562b1993 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -916,6 +916,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 diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index a57c612fd..4e0dd5d47 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -1101,6 +1101,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 diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index f2068915c..c94a5a4d6 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -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 diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index d6f21b79b..20eb47461 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -896,6 +896,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 diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 3f01dea99..00f5f3fe9 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -1102,6 +1102,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 diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index adc8acd18..d89e83968 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -1054,6 +1054,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 diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index ee9cfc91f..a73c6cea9 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -715,6 +715,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 diff --git a/src/MOM6 b/src/MOM6 index f2c89173d..0f26d6958 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit f2c89173d0b5446c30ddcc1e7cdb690f27fbd6e5 +Subproject commit 0f26d6958423d894823e0db79c6f9bfee64b0bfa