Skip to content

Commit

Permalink
MOM6: +*Non-Boussinesq bulk mixed layer calculations
Browse files Browse the repository at this point in the history 
- 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
  • Loading branch information
@mom6bot @marshallward
mom6bot authored and marshallward committed Sep 25, 2023
1 parent e67066a commit 3a136df
Show file tree
Hide file tree
Showing 16 changed files with 46 additions and 1 deletion.
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/benchmark/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/global_ALE/layer/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/nonBous_global/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions ocean_only/single_column/BML/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated 4 files
+33 −12 src/core/MOM_interface_heights.F90
+958 −381 src/parameterizations/vertical/MOM_bulk_mixed_layer.F90
+186 −116 src/parameterizations/vertical/MOM_energetic_PBL.F90
+27 −13 src/parameterizations/vertical/MOM_opacity.F90

0 comments on commit 3a136df

Please sign in to comment.