From 3a136df161e0eaf17249996cfec6843d18632608 Mon Sep 17 00:00:00 2001 From: MOM6 bot Date: Mon, 25 Sep 2023 14:36:43 -0400 Subject: [PATCH] MOM6: +*Non-Boussinesq bulk mixed layer calculations - NOAA-GFDL/MOM6@2f1bdc06d +*Non-Boussinesq bulk mixed layer calculations - NOAA-GFDL/MOM6@2337404b8 +SpV_avg optional argument to extract_optics_slice - NOAA-GFDL/MOM6@dd5c47d03 *Non-Boussinesq revision of energetic_PBL - NOAA-GFDL/MOM6@a7444b3d4 *Test for convergence in dz_to_thickness_EOS --- coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 3 +++ coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all | 3 +++ .../Intersperse_ice_1deg/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 3 +++ .../CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all | 3 +++ ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all | 3 +++ .../skin_warming_wind/BML/MOM_parameter_doc.all | 3 +++ ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all | 3 +++ ocean_only/benchmark/MOM_parameter_doc.all | 3 +++ ocean_only/global_ALE/layer/MOM_parameter_doc.all | 3 +++ ocean_only/nonBous_global/MOM_parameter_doc.all | 3 +++ ocean_only/single_column/BML/MOM_parameter_doc.all | 3 +++ src/MOM6 | 2 +- 16 files changed, 46 insertions(+), 1 deletion(-) 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 fe77b0ad33..dc74d5da71 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 @@ -1810,6 +1810,9 @@ ML_PRESORT_NK_CONV_ADJ = 4 ! [nondim] default = 0 BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. 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 07ceeec629..238d8c81b2 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 @@ -1810,6 +1810,9 @@ ML_PRESORT_NK_CONV_ADJ = 4 ! [nondim] default = 0 BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. 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 c88d39c449..b4e82aa0d4 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 @@ -1810,6 +1810,9 @@ ML_PRESORT_NK_CONV_ADJ = 4 ! [nondim] default = 0 BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 90d2976fb7..d158d1b07a 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1810,6 +1810,9 @@ ML_PRESORT_NK_CONV_ADJ = 4 ! [nondim] default = 0 BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 5cdbe59018..ff39db4d99 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1782,6 +1782,9 @@ ML_PRESORT_NK_CONV_ADJ = 4 ! [nondim] default = 0 BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. 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 6d655b5601..52b3f4dcc4 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1786,6 +1786,9 @@ ML_PRESORT_NK_CONV_ADJ = 4 ! [nondim] default = 0 BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 1fefb25fed..c2d7c2f722 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1782,6 +1782,9 @@ ML_PRESORT_NK_CONV_ADJ = 4 ! [nondim] default = 0 BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. 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 c282aaf46a..2a5e8221f5 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 @@ -1261,6 +1261,9 @@ ML_RESORT = False ! [Boolean] default = False BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. 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 8425b13e42..2650910590 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 @@ -1261,6 +1261,9 @@ ML_RESORT = False ! [Boolean] default = False BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. 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 d42cb30969..98957dc175 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 @@ -1261,6 +1261,9 @@ ML_RESORT = False ! [Boolean] default = False BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. 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 bccd701f2f..9aa3794fde 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 @@ -1261,6 +1261,9 @@ ML_RESORT = False ! [Boolean] default = False BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 35cb0aeaab..e2a440c6c6 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -1601,6 +1601,9 @@ ML_RESORT = False ! [Boolean] default = False BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index b0be983c33..ebfc1c2a36 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1962,6 +1962,9 @@ ML_PRESORT_NK_CONV_ADJ = 4 ! [nondim] default = 0 BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index cfc2ca411c..5d8ccc0fad 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1785,6 +1785,9 @@ ML_PRESORT_NK_CONV_ADJ = 4 ! [nondim] default = 0 BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index aedd9fa8e6..4803e8020f 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -1376,6 +1376,9 @@ ML_RESORT = False ! [Boolean] default = False BML_USTAR_MIN = 1.45842E-18 ! [m s-1] default = 1.45842E-18 ! The minimum value of ustar that should be used by the bulk mixed layer model ! in setting vertical TKE decay scales. This must be greater than 0. +BML_NONBOUSINESQ = False ! [Boolean] default = False + ! If true, use non-Boussinesq expressions for the energetic calculations used in + ! the bulk mixed layer calculations. RESOLVE_EKMAN = False ! [Boolean] default = False ! If true, the NKML>1 layers in the mixed layer are chosen to optimally ! represent the impact of the Ekman transport on the mixed layer TKE budget. diff --git a/src/MOM6 b/src/MOM6 index 25b57f475a..2f1bdc06d4 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 25b57f475adc648e2f69abb59a6ff875b59063e3 +Subproject commit 2f1bdc06d41e35582759c678de2a48ba1fd66fd9