Merge branch 'dev/master' into dev/gfdl

coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all

@@ -1234,7 +1234,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

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/
 

coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/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

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/
 

coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/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

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/
 

ice_ocean_SIS2/Baltic/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

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/
 

ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all

@@ -1458,7 +1458,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

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/
 

ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all

@@ -1471,7 +1471,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

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/
 

ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all

@@ -1484,7 +1484,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

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/
 

ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all

@@ -1471,7 +1471,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

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/
 

ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all

@@ -1490,7 +1490,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

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/
 

ice_ocean_SIS2/SIS2/MOM_parameter_doc.all

@@ -1247,7 +1247,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

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/
 

ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all

@@ -1247,7 +1247,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

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/
 

ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all

@@ -1247,7 +1247,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

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/
 

land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all

@@ -1389,7 +1389,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

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/
 

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

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/
 

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

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/
 

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,19 +1013,22 @@ 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).
 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

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 ===

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

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/
 

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

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/
 

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,19 +1013,22 @@ 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).
 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