From 902581567de7c04eac13c7ae444358fd79d23107 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 5 Jul 2018 16:46:47 -0400 Subject: [PATCH] MOM6: Merge branch 'gustavo-marques-update_KPP' into dev/master - Renaming of MOM_KPP changed MOM_parameter_doc files (NOAA-GFDL/MOM6@a7d5b5f) - New diagnostics added for separate entrainment rates for salinity/temperature - Updated SCM_idealized_hurricane to retain answers after default for INTERP_TYPE changed. - NOAA-GFDL/MOM6@f20ad2c Merge branch 'gustavo-marques-update_KPP' into dev/master - NOAA-GFDL/MOM6@a5c14ae Merge branch 'dev/master' into update_KPP - NOAA-GFDL/MOM6@41883ee Sets lnoDGat1=.true. when gradient should not be matched - NOAA-GFDL/MOM6@18b1598 Merge pull request #71 from gustavo-marques/fix_kpp - NOAA-GFDL/MOM6@62c6f47 Merge branch 'dev/ncar' into fix_kpp - NOAA-GFDL/MOM6@53e7a87 Fix bugs - NOAA-GFDL/MOM6@501f85b Improve KPP - NOAA-GFDL/MOM6@dbe277d Update comments - NOAA-GFDL/MOM6@a3f37c4 Update Doxygen - NOAA-GFDL/MOM6@fb49644 Clean comments - NOAA-GFDL/MOM6@cfb1edd Update diabatic - NOAA-GFDL/MOM6@e717072 Add FATAL error if USE_KPP=True and ADD_KV_SLOW=True - NOAA-GFDL/MOM6@4f44314 Update MOM_CVMix_shear - NOAA-GFDL/MOM6@dd6a625 Merge pull request #68 from alperaltuntas/kpp_changes - NOAA-GFDL/MOM6@b1f9bb0 remove duplicate CS%N allocation - NOAA-GFDL/MOM6@d0f4672 rename MOM_KPP.F90 as MOM_CVMix_KPP.F90 - NOAA-GFDL/MOM6@d34678e fix bld limiter after smoothing - NOAA-GFDL/MOM6@f1d6773 adjust diabatic driver for the new KPP_calculate - NOAA-GFDL/MOM6@a7d5b5f Rename MOM_KPP.F90 -> MOM_CVMix_KPP.F90 - NOAA-GFDL/MOM6@6e7159a Merge pull request #67 from gustavo-marques/restructure_diabatic_driver - NOAA-GFDL/MOM6@b3652f8 Merge branch 'dev/ncar' into restructure_diabatic_driver - NOAA-GFDL/MOM6@f11f6c2 Merge pull request #66 from gustavo-marques/merge-dev-master-candidate-2018-06-03 - NOAA-GFDL/MOM6@df2f537 Merge branch 'dev/ncar' into dev-master-candidate-2018-06-03 - NOAA-GFDL/MOM6@b01dda0 Clean unecessary layer-related code - NOAA-GFDL/MOM6@c9c4545 Merge branch 'restructure_diabatic_driver' of https://github.com/gustavo-marques/MOM6 into restructure_diabatic_driver - NOAA-GFDL/MOM6@139f6af Add comments - NOAA-GFDL/MOM6@1c15d0f Merge branch 'dev/ncar' into restructure_diabatic_driver - NOAA-GFDL/MOM6@db2f2d8 Merge pull request #65 from alperaltuntas/introduce_cvmix_tidal - NOAA-GFDL/MOM6@754f4af Merge pull request #2 from NCAR/dev/ncar - NOAA-GFDL/MOM6@21d1038 Check if Kv is associated before updating it - NOAA-GFDL/MOM6@b2fac04 add multi-smoothing and deepening-only smoothing options - NOAA-GFDL/MOM6@5477d8c Merge pull request #64 from NCAR/fix_mct_cap - NOAA-GFDL/MOM6@e12d952 fix a typo in ocn_comp_mct.F90 - NOAA-GFDL/MOM6@4c36f8f Computes diffusivity for salt and heat separetely - NOAA-GFDL/MOM6@fcdd55d Add missing code relate to old double-diffusion method - NOAA-GFDL/MOM6@e15fe54 Add missing code relate to old double-diffusion method - NOAA-GFDL/MOM6@88886d9 Doxygenize tracer_vertdiff - NOAA-GFDL/MOM6@8e19b4a Merge branch 'dev/ncar' into restructure_diabatic_driver - NOAA-GFDL/MOM6@c266f9f First step towards using Kd_heat and Kd_salt - NOAA-GFDL/MOM6@62ffc0b Merge pull request #63 from gustavo-marques/add_old_double_diffusion - NOAA-GFDL/MOM6@8c83e21 add viscosities due to tidal mixing - NOAA-GFDL/MOM6@cfc6742 prevent OBL depths deeper than the bathymetric depth - NOAA-GFDL/MOM6@4dd0111 add original OBLdepth diag --- .../CM2G63L/MOM_parameter_doc.all | 2 +- .../CM2G63L/MOM_parameter_doc.short | 2 +- .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 2 +- .../MOM_parameter_doc.short | 2 +- .../Concurrent_ice_1deg/MOM_parameter_doc.all | 2 +- .../MOM_parameter_doc.short | 2 +- ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 2 +- ice_ocean_SIS2/Baltic/MOM_parameter_doc.short | 2 +- .../MOM_parameter_doc.all | 2 +- .../MOM_parameter_doc.short | 2 +- .../Baltic_OM4_025/MOM_parameter_doc.all | 2 +- .../Baltic_OM4_025/MOM_parameter_doc.short | 2 +- .../Baltic_OM4_05/MOM_parameter_doc.all | 2 +- .../Baltic_OM4_05/MOM_parameter_doc.short | 2 +- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 2 +- .../OM4_025/MOM_parameter_doc.short | 2 +- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 2 +- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short | 2 +- ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 2 +- ice_ocean_SIS2/SIS2/MOM_parameter_doc.short | 2 +- .../SIS2_bergs_cgrid/MOM_parameter_doc.all | 2 +- .../SIS2_bergs_cgrid/MOM_parameter_doc.short | 2 +- .../SIS2_cgrid/MOM_parameter_doc.all | 2 +- .../SIS2_cgrid/MOM_parameter_doc.short | 2 +- .../OM_360x320_C180/MOM_parameter_doc.all | 2 +- .../OM_360x320_C180/MOM_parameter_doc.short | 2 +- .../cooling_only/BML/MOM_parameter_doc.all | 2 +- .../cooling_only/BML/MOM_parameter_doc.short | 2 +- .../cooling_only/EPBL/MOM_parameter_doc.all | 2 +- .../cooling_only/EPBL/MOM_parameter_doc.short | 2 +- .../cooling_only/KPP/MOM_parameter_doc.all | 13 +-- .../cooling_only/KPP/MOM_parameter_doc.short | 5 +- .../mech_only/BML/MOM_parameter_doc.all | 2 +- .../mech_only/BML/MOM_parameter_doc.short | 2 +- .../mech_only/EPBL/MOM_parameter_doc.all | 2 +- .../mech_only/EPBL/MOM_parameter_doc.short | 2 +- .../mech_only/KPP/MOM_parameter_doc.all | 13 +-- .../mech_only/KPP/MOM_parameter_doc.short | 5 +- .../BML/MOM_parameter_doc.all | 2 +- .../BML/MOM_parameter_doc.short | 2 +- .../EPBL/MOM_parameter_doc.all | 2 +- .../EPBL/MOM_parameter_doc.short | 2 +- .../KPP/MOM_parameter_doc.all | 13 +-- .../KPP/MOM_parameter_doc.short | 5 +- .../wind_only/BML/MOM_parameter_doc.all | 2 +- .../wind_only/BML/MOM_parameter_doc.short | 2 +- .../wind_only/EPBL/MOM_parameter_doc.all | 2 +- .../wind_only/EPBL/MOM_parameter_doc.short | 2 +- .../wind_only/KPP/MOM_parameter_doc.all | 13 +-- .../wind_only/KPP/MOM_parameter_doc.short | 5 +- ocean_only/DOME/MOM_parameter_doc.all | 2 +- ocean_only/DOME/MOM_parameter_doc.short | 2 +- .../Phillips_2layer/MOM_parameter_doc.all | 2 +- .../Phillips_2layer/MOM_parameter_doc.short | 2 +- ocean_only/SCM_idealized_hurricane/MOM_input | 3 + .../MOM_parameter_doc.all | 13 +-- .../MOM_parameter_doc.short | 5 +- .../adjustment2d/layer/MOM_parameter_doc.all | 2 +- .../layer/MOM_parameter_doc.short | 2 +- .../adjustment2d/rho/MOM_parameter_doc.all | 2 +- .../adjustment2d/rho/MOM_parameter_doc.short | 2 +- .../adjustment2d/z/MOM_parameter_doc.all | 2 +- .../adjustment2d/z/MOM_parameter_doc.short | 2 +- ocean_only/benchmark/MOM_parameter_doc.all | 2 +- ocean_only/benchmark/MOM_parameter_doc.short | 2 +- ocean_only/circle_obcs/MOM_parameter_doc.all | 2 +- .../circle_obcs/MOM_parameter_doc.short | 2 +- .../external_gwave/MOM_parameter_doc.all | 2 +- .../external_gwave/MOM_parameter_doc.short | 2 +- .../layer/MOM_parameter_doc.all | 2 +- .../layer/MOM_parameter_doc.short | 2 +- .../flow_downslope/rho/MOM_parameter_doc.all | 2 +- .../rho/MOM_parameter_doc.short | 2 +- .../sigma/MOM_parameter_doc.all | 2 +- .../sigma/MOM_parameter_doc.short | 2 +- .../flow_downslope/z/MOM_parameter_doc.all | 2 +- .../flow_downslope/z/MOM_parameter_doc.short | 2 +- .../global_ALE/hycom/MOM_parameter_doc.all | 2 +- .../global_ALE/hycom/MOM_parameter_doc.short | 2 +- .../global_ALE/layer/MOM_parameter_doc.all | 2 +- .../global_ALE/layer/MOM_parameter_doc.short | 2 +- .../global_ALE/layer/available_diags.000000 | 80 +++++++++++++++---- ocean_only/global_ALE/z/MOM_parameter_doc.all | 2 +- .../global_ALE/z/MOM_parameter_doc.short | 2 +- .../global_ALE/z/available_diags.000000 | 80 +++++++++++++++---- .../lock_exchange/MOM_parameter_doc.all | 2 +- .../lock_exchange/MOM_parameter_doc.short | 2 +- .../MOM_parameter_doc.all | 2 +- .../MOM_parameter_doc.short | 2 +- .../nonBous_global/MOM_parameter_doc.all | 2 +- .../nonBous_global/MOM_parameter_doc.short | 2 +- .../resting/layer/MOM_parameter_doc.all | 2 +- .../resting/layer/MOM_parameter_doc.short | 2 +- ocean_only/resting/z/MOM_parameter_doc.all | 2 +- ocean_only/resting/z/MOM_parameter_doc.short | 2 +- .../seamount/layer/MOM_parameter_doc.all | 2 +- .../seamount/layer/MOM_parameter_doc.short | 2 +- ocean_only/seamount/rho/MOM_parameter_doc.all | 2 +- .../seamount/rho/MOM_parameter_doc.short | 2 +- .../seamount/sigma/MOM_parameter_doc.all | 2 +- .../seamount/sigma/MOM_parameter_doc.short | 2 +- ocean_only/seamount/z/MOM_parameter_doc.all | 2 +- ocean_only/seamount/z/MOM_parameter_doc.short | 2 +- .../single_column/BML/MOM_parameter_doc.all | 2 +- .../single_column/BML/MOM_parameter_doc.short | 2 +- .../single_column/EPBL/MOM_parameter_doc.all | 13 +-- .../EPBL/MOM_parameter_doc.short | 2 +- .../single_column/KPP/MOM_parameter_doc.all | 13 +-- .../single_column/KPP/MOM_parameter_doc.short | 5 +- .../sloshing/layer/MOM_parameter_doc.all | 2 +- .../sloshing/layer/MOM_parameter_doc.short | 2 +- ocean_only/sloshing/rho/MOM_parameter_doc.all | 2 +- .../sloshing/rho/MOM_parameter_doc.short | 2 +- ocean_only/sloshing/z/MOM_parameter_doc.all | 2 +- ocean_only/sloshing/z/MOM_parameter_doc.short | 2 +- .../MOM_parameter_doc.all | 2 +- .../MOM_parameter_doc.short | 2 +- .../tracer_mixing/rho/MOM_parameter_doc.all | 2 +- .../tracer_mixing/rho/MOM_parameter_doc.short | 2 +- .../tracer_mixing/z/MOM_parameter_doc.all | 2 +- .../tracer_mixing/z/MOM_parameter_doc.short | 2 +- src/MOM6 | 2 +- 122 files changed, 317 insertions(+), 179 deletions(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index 648c1b4246..f94c07acd9 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -1231,7 +1231,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short index 6167b97d6b..03e44c0983 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short @@ -393,7 +393,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 5e6cd1f378..e77c98c3a2 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 @@ -1227,7 +1227,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short index 47d213f047..5e16ed5d58 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short @@ -389,7 +389,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 5e6cd1f378..e77c98c3a2 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 @@ -1227,7 +1227,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short index 47d213f047..5e16ed5d58 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short @@ -389,7 +389,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 0b6b09553c..1429d9f2a1 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1227,7 +1227,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short index 1997b7f59b..8effe63ce9 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short @@ -401,7 +401,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 a150f2aa02..b5ff3ac353 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 @@ -1455,7 +1455,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short index 1b309f0ef6..365fcab734 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short @@ -467,7 +467,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 3c21baa505..f7202aca09 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -1468,7 +1468,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short index 4d76108795..522be3c75b 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short @@ -578,7 +578,7 @@ EPBL_IS_ADDITIVE = False ! [Boolean] default = True ! other diffusivities. Otherwise, the larger of kappa- ! shear and ePBL diffusivities are used. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 fa4134abcc..a5d6ed0c55 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -1481,7 +1481,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short index bee1feb7c5..7da7ec4b38 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short @@ -603,7 +603,7 @@ EPBL_IS_ADDITIVE = False ! [Boolean] default = True ! other diffusivities. Otherwise, the larger of kappa- ! shear and ePBL diffusivities are used. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 0e9c797b26..3fd27047ec 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1468,7 +1468,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index 96e873bdb7..46f8b0ec8f 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -587,7 +587,7 @@ EPBL_IS_ADDITIVE = False ! [Boolean] default = True ! other diffusivities. Otherwise, the larger of kappa- ! shear and ePBL diffusivities are used. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index f7ee73ab37..8b59784cb3 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1487,7 +1487,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index 21e4b20400..b2f25ece0d 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -617,7 +617,7 @@ EPBL_IS_ADDITIVE = False ! [Boolean] default = True ! other diffusivities. Otherwise, the larger of kappa- ! shear and ePBL diffusivities are used. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 6e17f8bf2b..8ebcddaa14 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1244,7 +1244,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short index 0f07d49325..ce501f9632 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short @@ -424,7 +424,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 9fff57ee2b..8cd7d887ed 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1244,7 +1244,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short index 6158be0663..dffff0a47a 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short @@ -424,7 +424,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 9fff57ee2b..8cd7d887ed 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1244,7 +1244,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short index 6158be0663..dffff0a47a 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short @@ -424,7 +424,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index 280c77a7a7..9158ce67d2 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -1386,7 +1386,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short index 2549a3a52c..9bba54fde6 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short @@ -491,7 +491,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 34482000be..5b9577fb17 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 @@ -911,7 +911,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short index d82cf7bd49..c1a8d373fb 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short @@ -309,7 +309,7 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 d85cb4fe12..109cfd5e91 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short index dfd6170d4b..75f71ebe09 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short @@ -335,7 +335,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 add43ba644..5d3f5b68bc 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -1013,9 +1013,9 @@ APPLY_NONLOCAL_TRANSPORT = True ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -1023,9 +1023,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "cubic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short index 94d40d16e2..a09a5439e2 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short @@ -331,13 +331,16 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False ! If true, turns on the [CVMix] KPP scheme of Large et al., 1994, ! to calculate diffusivities and non-local transport in the OBL. KPP% +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. %KPP ! === module MOM_tidal_mixing === 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 9f145a8cdf..a1a94e55c2 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 @@ -911,7 +911,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short index 1c7838c889..7d548436e0 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short @@ -309,7 +309,7 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 d606bd1b20..297e425f89 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short index 247e33ce7f..cc8c952519 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short @@ -335,7 +335,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 295b3bf816..275a99ca61 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -1013,9 +1013,9 @@ APPLY_NONLOCAL_TRANSPORT = True ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -1023,9 +1023,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "cubic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short index baa29ef57c..c393d29834 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short @@ -331,13 +331,16 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False ! If true, turns on the [CVMix] KPP scheme of Large et al., 1994, ! to calculate diffusivities and non-local transport in the OBL. KPP% +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. %KPP ! === module MOM_tidal_mixing === 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 a799f28a4c..d650133f0d 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 @@ -911,7 +911,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short index 3056a57a3b..3d4b9361dc 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short @@ -309,7 +309,7 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 71e0c39fb6..8f9648ae9d 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short index 54e730a522..2977f10bcd 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short @@ -335,7 +335,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 46df24509d..9f783f677a 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -1013,9 +1013,9 @@ APPLY_NONLOCAL_TRANSPORT = True ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -1023,9 +1023,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "cubic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short index 737aa09a94..310325a92b 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short @@ -331,13 +331,16 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False ! If true, turns on the [CVMix] KPP scheme of Large et al., 1994, ! to calculate diffusivities and non-local transport in the OBL. KPP% +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. %KPP ! === module MOM_tidal_mixing === 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 bf4cb2650a..1f1daed4c8 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 @@ -911,7 +911,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short index e9d8d61c4a..df1827cf15 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short @@ -309,7 +309,7 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 db464e1df6..ffb199f789 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short index a350bf9a22..11c818bfa3 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short @@ -335,7 +335,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 5c09ad75ac..8a2297430c 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 @@ -1000,7 +1000,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -1013,9 +1013,9 @@ APPLY_NONLOCAL_TRANSPORT = True ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -1023,9 +1023,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "cubic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short index 988d7dd237..6239e7a280 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short @@ -331,13 +331,16 @@ Z_OUTPUT_GRID_FILE = "zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False ! If true, turns on the [CVMix] KPP scheme of Large et al., 1994, ! to calculate diffusivities and non-local transport in the OBL. KPP% +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. %KPP ! === module MOM_tidal_mixing === diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 647e1059f4..f02e368054 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -1064,7 +1064,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/DOME/MOM_parameter_doc.short b/ocean_only/DOME/MOM_parameter_doc.short index ad42971c61..90d4e8bb76 100644 --- a/ocean_only/DOME/MOM_parameter_doc.short +++ b/ocean_only/DOME/MOM_parameter_doc.short @@ -353,7 +353,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index 738108e841..9b497ede70 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -1041,7 +1041,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.short b/ocean_only/Phillips_2layer/MOM_parameter_doc.short index 7006b5b29f..e2fba74f90 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.short +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.short @@ -376,7 +376,7 @@ KHTH = 8000.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/SCM_idealized_hurricane/MOM_input b/ocean_only/SCM_idealized_hurricane/MOM_input index 381cdee8c4..e9b927f8ae 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_input +++ b/ocean_only/SCM_idealized_hurricane/MOM_input @@ -341,6 +341,9 @@ APPLY_NONLOCAL_TRANSPORT = False ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. %KPP ! === module MOM_diffConvection === diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 012dce6e27..7c724c2698 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -997,7 +997,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -1010,9 +1010,9 @@ APPLY_NONLOCAL_TRANSPORT = False ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -1020,9 +1020,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "cubic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short index c75fbce931..a0e644926e 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short @@ -330,7 +330,7 @@ MAXVEL = 6.0 ! [m s-1] default = 3.0E+08 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -341,6 +341,9 @@ APPLY_NONLOCAL_TRANSPORT = False ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. %KPP ! === module MOM_tidal_mixing === diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 3cde3da621..1226cc17b5 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -1105,7 +1105,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short index 9ec02ef724..d01b2bd3e0 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short @@ -377,7 +377,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 9517d58aa5..940056e89e 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -1236,7 +1236,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short index d432268706..440c56d470 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short @@ -425,7 +425,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index bb1946254d..e3db86c0b1 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -1190,7 +1190,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.short b/ocean_only/adjustment2d/z/MOM_parameter_doc.short index 376ca463e6..6123b39445 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.short @@ -401,7 +401,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index d844403ad1..a26228a573 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -1183,7 +1183,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/benchmark/MOM_parameter_doc.short b/ocean_only/benchmark/MOM_parameter_doc.short index f833c71281..5944fbce1b 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.short +++ b/ocean_only/benchmark/MOM_parameter_doc.short @@ -393,7 +393,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 5.0 ! [nondim] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 3a5c26e0e6..e4ad9f0595 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -1138,7 +1138,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.short b/ocean_only/circle_obcs/MOM_parameter_doc.short index 730c428452..c8b9a392be 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.short +++ b/ocean_only/circle_obcs/MOM_parameter_doc.short @@ -343,7 +343,7 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 8b31973e98..9eaa7b0f67 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -1086,7 +1086,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/external_gwave/MOM_parameter_doc.short b/ocean_only/external_gwave/MOM_parameter_doc.short index 78eec450f9..46856c1dc6 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.short +++ b/ocean_only/external_gwave/MOM_parameter_doc.short @@ -356,7 +356,7 @@ DTBT = 20.0 ! [s or nondim] default = -0.98 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 28c7df276b..4c5cac37e0 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -1097,7 +1097,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short index 0d161b1acb..fb15c53b71 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short @@ -374,7 +374,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index b449cce819..9ad6ddcff2 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -1230,7 +1230,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short index 5a67afb3d6..0ec71faada 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short @@ -424,7 +424,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index b61d2ffbad..432c742a68 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -1184,7 +1184,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short index c5c3bb8772..6b45e11fdf 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short @@ -397,7 +397,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 21b12e6005..2d220912bf 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -1184,7 +1184,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.short b/ocean_only/flow_downslope/z/MOM_parameter_doc.short index 42f5efb13b..0f2257549b 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.short @@ -397,7 +397,7 @@ KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 1af8641693..b223a27bbd 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1499,7 +1499,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short index 940415d8c6..fa49938812 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short @@ -493,7 +493,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 63846d4a7e..489542ecb5 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1330,7 +1330,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.short b/ocean_only/global_ALE/layer/MOM_parameter_doc.short index 9c656ca506..bd907940ec 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.short @@ -405,7 +405,7 @@ Z_OUTPUT_GRID_FILE = "analysis_vgrid_lev35.v1.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index 7331d7832b..1644828258 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -2041,6 +2041,70 @@ ! long_name: Layer entrainment from below per timestep ! units: m ! cell_methods: z_l:mean +"ocean_model", "ea_t" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "ea_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "ea_t" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "ea_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: z_l:mean +"ocean_model", "eb_t" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "eb_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "eb_t" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "eb_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: z_l:mean +"ocean_model", "ea_s" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "ea_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "ea_s" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "ea_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: z_l:mean +"ocean_model", "eb_s" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "eb_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "eb_s" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "eb_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: z_l:mean "ocean_model", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing ! units: m s-2 @@ -2073,22 +2137,6 @@ ! long_name: Meridional Acceleration from Diapycnal Mixing ! units: m s-2 ! cell_methods: z_l:mean -"ocean_model", "wd" [Used] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: xh:mean yh:mean zi:point area:mean -"ocean_model", "wd_xyave" [Unused] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: zi:point -"ocean_model_z", "wd" [Unused] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: xh:mean yh:mean z_i:point area:mean -"ocean_model_z", "wd_xyave" [Unused] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: z_i:point "ocean_model", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces ! units: degC m s-1 diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 3f80cb6f8d..649b5ae526 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1451,7 +1451,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.short b/ocean_only/global_ALE/z/MOM_parameter_doc.short index 3d95fb90b0..23d10fe0b6 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.short @@ -467,7 +467,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 15c4223165..0487fa6d3e 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -2081,6 +2081,70 @@ ! long_name: Layer entrainment from below per timestep ! units: m ! cell_methods: z_l:mean +"ocean_model", "ea_t" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "ea_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "ea_t" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "ea_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from above per timestep + ! units: m + ! cell_methods: z_l:mean +"ocean_model", "eb_t" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "eb_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "eb_t" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "eb_t_xyave" [Unused] + ! long_name: Layer (heat) entrainment from below per timestep + ! units: m + ! cell_methods: z_l:mean +"ocean_model", "ea_s" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "ea_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "ea_s" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "ea_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from above per timestep + ! units: m + ! cell_methods: z_l:mean +"ocean_model", "eb_s" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "eb_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: zl:mean +"ocean_model_z", "eb_s" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "eb_s_xyave" [Unused] + ! long_name: Layer (salt) entrainment from below per timestep + ! units: m + ! cell_methods: z_l:mean "ocean_model", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing ! units: m s-2 @@ -2113,22 +2177,6 @@ ! long_name: Meridional Acceleration from Diapycnal Mixing ! units: m s-2 ! cell_methods: z_l:mean -"ocean_model", "wd" [Used] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: xh:mean yh:mean zi:point area:mean -"ocean_model", "wd_xyave" [Unused] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: zi:point -"ocean_model_z", "wd" [Unused] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: xh:mean yh:mean z_i:point area:mean -"ocean_model_z", "wd_xyave" [Unused] - ! long_name: Diapycnal Velocity - ! units: m s-1 - ! cell_methods: z_i:point "ocean_model", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces ! units: degC m s-1 diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index a0c6670f16..bdbd72f11d 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -1089,7 +1089,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.short b/ocean_only/lock_exchange/MOM_parameter_doc.short index d473f1ec66..d88e821011 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.short +++ b/ocean_only/lock_exchange/MOM_parameter_doc.short @@ -338,7 +338,7 @@ DTBT = 25.0 ! [s or nondim] default = -0.98 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ 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 cdebcf5b2d..53e1e11e9a 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -1218,7 +1218,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short index 71402000ca..4f6dcf42bd 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short @@ -391,7 +391,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 10.0 ! [nondim] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 27097d1a7d..7e4e4166cd 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1250,7 +1250,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.short b/ocean_only/nonBous_global/MOM_parameter_doc.short index 5ab3a72e46..75aa53fdd1 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.short +++ b/ocean_only/nonBous_global/MOM_parameter_doc.short @@ -430,7 +430,7 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index af0728ceca..7650d53db9 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -1086,7 +1086,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/resting/layer/MOM_parameter_doc.short b/ocean_only/resting/layer/MOM_parameter_doc.short index aba7b59fe9..9a3963b315 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.short +++ b/ocean_only/resting/layer/MOM_parameter_doc.short @@ -355,7 +355,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 635a8c4c95..2b7956c07d 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -1173,7 +1173,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/resting/z/MOM_parameter_doc.short b/ocean_only/resting/z/MOM_parameter_doc.short index 6b2c8d75ac..95735a41fd 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.short +++ b/ocean_only/resting/z/MOM_parameter_doc.short @@ -368,7 +368,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index bede84b974..3635d88eec 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -1117,7 +1117,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.short b/ocean_only/seamount/layer/MOM_parameter_doc.short index fb1f7d9ce3..c56a8892c7 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.short +++ b/ocean_only/seamount/layer/MOM_parameter_doc.short @@ -370,7 +370,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index c5257cc3f1..e5050cce3a 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -1248,7 +1248,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.short b/ocean_only/seamount/rho/MOM_parameter_doc.short index 7af86584d3..af98516d44 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.short +++ b/ocean_only/seamount/rho/MOM_parameter_doc.short @@ -422,7 +422,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 1aecf78d36..0deb4be4a6 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -1202,7 +1202,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.short b/ocean_only/seamount/sigma/MOM_parameter_doc.short index c5c32f81a7..9babed0042 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.short +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.short @@ -394,7 +394,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 00443b3df0..2be9c6b190 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -1202,7 +1202,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/seamount/z/MOM_parameter_doc.short b/ocean_only/seamount/z/MOM_parameter_doc.short index 139f498e13..263ccfdb6b 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.short +++ b/ocean_only/seamount/z/MOM_parameter_doc.short @@ -394,7 +394,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index 6e89075667..c8045626a4 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -889,7 +889,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.short b/ocean_only/single_column/BML/MOM_parameter_doc.short index 91d18b34e6..4b5ecd6238 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.short +++ b/ocean_only/single_column/BML/MOM_parameter_doc.short @@ -267,7 +267,7 @@ Z_OUTPUT_GRID_FILE = "../zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 251cd0e205..c96338128a 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -969,7 +969,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -982,9 +982,9 @@ APPLY_NONLOCAL_TRANSPORT = False ! [Boolean] default = False ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -992,9 +992,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "quadratic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.short b/ocean_only/single_column/EPBL/MOM_parameter_doc.short index f3b1ac7d6a..7238d47325 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.short +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.short @@ -310,7 +310,7 @@ ENERGETICS_SFC_PBL = True ! [Boolean] default = False ! layer scheme to determine the diffusivity and viscosity ! in the surface boundary layer. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [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 7672afe364..7d4ca34b76 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -969,7 +969,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False @@ -982,9 +982,9 @@ APPLY_NONLOCAL_TRANSPORT = True ! [Boolean] default = True ! If True, applies the non-local transport to heat and scalars. ! If False, calculates the non-local transport and tendencies but ! purely for diagnostic purposes. -SMOOTH_BLD = False ! [Boolean] default = False - ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT. - ! computed via CVMix to reduce any horizontal two-grid-point noise. +N_SMOOTH = 0 ! default = 0 + ! The number of times the 1-1-4-1-1 Laplacian filter is applied on + ! OBL depth. RI_CRIT = 0.3 ! [nondim] default = 0.3 ! Critical bulk Richardson number used to define depth of the ! surface Ocean Boundary Layer (OBL). @@ -992,9 +992,12 @@ VON_KARMAN = 0.4 ! [nondim] default = 0.4 ! von Karman constant. ENHANCE_DIFFUSION = True ! [Boolean] default = True ! If True, adds enhanced diffusion at the based of the boundary layer. -INTERP_TYPE = "cubic" ! default = "cubic" +INTERP_TYPE = "cubic" ! default = "quadratic" ! Type of interpolation to determine the OBL depth. ! Allowed types are: linear, quadratic, cubic. +INTERP_TYPE2 = "LMD94" ! default = "LMD94" + ! Type of interpolation to compute diff and visc at OBL_depth. + ! Allowed types are: linear, quadratic, cubic or LMD94. COMPUTE_EKMAN = False ! [Boolean] default = False ! If True, limit OBL depth to be no deeper than Ekman depth. COMPUTE_MONIN_OBUKHOV = False ! [Boolean] default = False diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.short b/ocean_only/single_column/KPP/MOM_parameter_doc.short index 52db309f97..5201192336 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.short +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.short @@ -306,13 +306,16 @@ Z_OUTPUT_GRID_FILE = "../zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = True ! [Boolean] default = False ! If true, turns on the [CVMix] KPP scheme of Large et al., 1994, ! to calculate diffusivities and non-local transport in the OBL. KPP% +INTERP_TYPE = "cubic" ! default = "quadratic" + ! Type of interpolation to determine the OBL depth. + ! Allowed types are: linear, quadratic, cubic. NLT_SHAPE = "PARABOLIC" ! default = "CVMix" ! MOM6 method to set nonlocal transport profile. ! Over-rides the result from CVMix. Allowed values are: diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 7b69c8792c..1302d923aa 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -1092,7 +1092,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.short b/ocean_only/sloshing/layer/MOM_parameter_doc.short index dec84ff828..6758922043 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.short +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.short @@ -364,7 +364,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 4101d70917..5be619c057 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -1225,7 +1225,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.short b/ocean_only/sloshing/rho/MOM_parameter_doc.short index 13f138cbf4..c5e2467c0f 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.short +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.short @@ -411,7 +411,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 1fd5bfca49..b4a92f949c 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -1179,7 +1179,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.short b/ocean_only/sloshing/z/MOM_parameter_doc.short index 735e6927c2..8e94391b9d 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.short +++ b/ocean_only/sloshing/z/MOM_parameter_doc.short @@ -387,7 +387,7 @@ KHTH = 500.0 ! [m2 s-1] default = 0.0 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index 6292739a52..d6d0f3a70b 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -1091,7 +1091,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.short b/ocean_only/torus_advection_test/MOM_parameter_doc.short index 19b73113c3..4137944da5 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.short +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.short @@ -359,7 +359,7 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index e4531df3e0..cbe1d3149b 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -1237,7 +1237,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short index a74a01a20d..8ca51ae50c 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short @@ -420,7 +420,7 @@ DTBT = 5.0 ! [s or nondim] default = -0.98 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index cfb60213e8..19174bfb88 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -1191,7 +1191,7 @@ DIAG_MLD_DENSITY_DIFF = 0.1 ! [kg/m3] default = 0.1 ! The MLD is the depth at which the density is larger than the ! surface density by the specified amount. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ USE_KPP = False ! [Boolean] default = False diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short index d7d5a53de0..7a3c55fce9 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short @@ -396,7 +396,7 @@ DTBT = 5.0 ! [s or nondim] default = -0.98 ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. -! === module MOM_KPP === +! === module MOM_CVMix_KPP === ! This is the MOM wrapper to CVMix:KPP ! See http://cvmix.github.io/ diff --git a/src/MOM6 b/src/MOM6 index d1ceed0ad1..f20ad2c4d6 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit d1ceed0ad1a615287275b2513666755cec7d9006 +Subproject commit f20ad2c4d6421af33da362cec80ab3279a2dd14e