*Eliminate CORRECT_DENSITY from MOM_input files

  Removed lines setting CORRECT_DENSITY in all MOM_input files, which is the
same as setting CORRECT_DENSITY=True in cases that use MOM_entrain_diffusive,
and is eliminating an unused parameter in other cases.  This changes answers
in only one experiment, resting/layer, which uses CORRECT_DENSITY=False with
a non-zero value of Kd.  The MOM_parameter_doc files are changed in 7 other
examples, but the answers do not change.

ice_ocean_SIS/Amery/MOM_input

@@ -408,9 +408,6 @@ RHO_0 = 1035.0                  !    RHO_0 is used in the Boussinesq
                                 !  pressure gradients, in units of kg m-3.
 C_P = 3925.0                    !    C_P is the heat capacity of sea water in
                                 !  J kg-1 K-1, approximated as a constant.
-CORRECT_DENSITY = True          !    If CORRECT_DENSITY is defined, the layer
-                                !  densities are restored toward their target
-                                !  values by the diapycnal mixing.
 
 !  Specify the properties of the surface forcing.
 WIND_STAGGER = "B"              !  "A", "B", or "C" to indicate the

ice_ocean_SIS/GIS_0125/MOM_input

@@ -405,9 +405,6 @@ RHO_0 = 1035.0                  !    RHO_0 is used in the Boussinesq
                                 !  pressure gradients, in units of kg m-3.
 C_P = 3925.0                    !    C_P is the heat capacity of sea water in
                                 !  J kg-1 K-1, approximated as a constant.
-CORRECT_DENSITY = True          !    If CORRECT_DENSITY is defined, the layer
-                                !  densities are restored toward their target
-                                !  values by the diapycnal mixing.
 
 !  Specify the properties of the surface forcing.
 WIND_STAGGER = "B"              !  "A", "B", or "C" to indicate the

ocean_only/ISOMIP/layer/MOM_input

@@ -497,10 +497,6 @@ CONVECTION%
 %CONVECTION
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 20                 ! default = 5
                                 ! The maximum number of iterations that may be used to
                                 ! calculate the interior diapycnal entrainment.

ocean_only/ISOMIP/rho/MOM_input

@@ -590,10 +590,6 @@ CONVECTION%
 %CONVECTION
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 20                 ! default = 5
                                 ! The maximum number of iterations that may be used to
                                 ! calculate the interior diapycnal entrainment.

ocean_only/MESO_025_23L/MOM_input

@@ -424,9 +424,6 @@ RHO_0 = 1035.0                  !    RHO_0 is used in the Boussinesq
                                 !  pressure gradients, in units of kg m-3.
 C_P = 3925.0                    !    C_P is the heat capacity of sea water in
                                 !  J kg-1 K-1, approximated as a constant.
-CORRECT_DENSITY = True          !    If CORRECT_DENSITY is defined, the layer
-                                !  densities are restored toward their target
-                                !  values by the diapycnal mixing.
 
 !  Specify the properties of the passive tracers.
 KHTR = 0.0                      !    KHTR is the along-isopycnal tracer

ocean_only/adjustment2d/common/MOM_input

@@ -401,10 +401,6 @@ CONVECTION%
 %CONVECTION
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
 
 ! === module MOM_regularize_layers ===
 

ocean_only/adjustment2d/layer/MOM_parameter_doc.all

@@ -1097,7 +1097,7 @@ USE_CVMix_CONVECTION = False    !   [Boolean] default = False
                                 ! parameters are contained in the CVMix_CONVECTION% parameter block.
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
+CORRECT_DENSITY = True          !   [Boolean] default = True
                                 ! If true, and USE_EOS is true, the layer densities are restored toward their
                                 ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 5                  ! default = 5

ocean_only/adjustment2d/layer/MOM_parameter_doc.short

@@ -362,9 +362,6 @@ DTBT = 5.0                      !   [s or nondim] default = -0.98
 ! Parameterization of enhanced mixing due to convection via CVMix
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are restored toward their
-                                ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 
 ! === module MOM_set_diffusivity ===
 BBL_EFFIC = 0.0                 !   [nondim] default = 0.2

ocean_only/external_gwave/MOM_input

@@ -388,10 +388,6 @@ CONVECTION%
 %CONVECTION
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 20                 ! default = 5
                                 ! The maximum number of iterations that may be used to
                                 ! calculate the interior diapycnal entrainment.

ocean_only/external_gwave/MOM_parameter_doc.all

@@ -1083,7 +1083,7 @@ USE_CVMix_CONVECTION = False    !   [Boolean] default = False
                                 ! parameters are contained in the CVMix_CONVECTION% parameter block.
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
+CORRECT_DENSITY = True          !   [Boolean] default = True
                                 ! If true, and USE_EOS is true, the layer densities are restored toward their
                                 ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 20                 ! default = 5

ocean_only/external_gwave/MOM_parameter_doc.short

@@ -339,9 +339,6 @@ DTBT = 20.0                     !   [s or nondim] default = -0.98
 ! Parameterization of enhanced mixing due to convection via CVMix
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are restored toward their
-                                ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 20                 ! default = 5
                                 ! The maximum number of iterations that may be used to calculate the interior
                                 ! diapycnal entrainment.

ocean_only/flow_downslope/common/MOM_input

@@ -394,10 +394,6 @@ CONVECTION%
 %CONVECTION
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
 
 ! === module MOM_regularize_layers ===
 

ocean_only/flow_downslope/layer/MOM_parameter_doc.all

@@ -1090,7 +1090,7 @@ USE_CVMix_CONVECTION = False    !   [Boolean] default = False
                                 ! parameters are contained in the CVMix_CONVECTION% parameter block.
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
+CORRECT_DENSITY = True          !   [Boolean] default = True
                                 ! If true, and USE_EOS is true, the layer densities are restored toward their
                                 ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 5                  ! default = 5

ocean_only/flow_downslope/layer/MOM_parameter_doc.short

@@ -359,9 +359,6 @@ DTBT = 20.0                     !   [s or nondim] default = -0.98
 ! Parameterization of enhanced mixing due to convection via CVMix
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are restored toward their
-                                ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 
 ! === module MOM_set_diffusivity ===
 

ocean_only/lock_exchange/MOM_input

@@ -377,10 +377,6 @@ CONVECTION%
 %CONVECTION
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 20                 ! default = 5
                                 ! The maximum number of iterations that may be used to
                                 ! calculate the interior diapycnal entrainment.

ocean_only/lock_exchange/MOM_parameter_doc.all

@@ -1086,7 +1086,7 @@ USE_CVMix_CONVECTION = False    !   [Boolean] default = False
                                 ! parameters are contained in the CVMix_CONVECTION% parameter block.
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
+CORRECT_DENSITY = True          !   [Boolean] default = True
                                 ! If true, and USE_EOS is true, the layer densities are restored toward their
                                 ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 20                 ! default = 5

ocean_only/lock_exchange/MOM_parameter_doc.short

@@ -329,9 +329,6 @@ DTBT = 25.0                     !   [s or nondim] default = -0.98
 ! Parameterization of enhanced mixing due to convection via CVMix
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are restored toward their
-                                ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 20                 ! default = 5
                                 ! The maximum number of iterations that may be used to calculate the interior
                                 ! diapycnal entrainment.

ocean_only/mixed_layer_restrat_2d/MOM_input

@@ -416,10 +416,6 @@ CONVECTION%
 %CONVECTION
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
 
 ! === module MOM_regularize_layers ===
 

ocean_only/resting/common/MOM_input

@@ -378,10 +378,6 @@ CONVECTION%
 %CONVECTION
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
 
 ! === module MOM_regularize_layers ===
 

ocean_only/resting/layer/MOM_parameter_doc.all

@@ -1079,7 +1079,7 @@ USE_CVMix_CONVECTION = False    !   [Boolean] default = False
                                 ! parameters are contained in the CVMix_CONVECTION% parameter block.
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
+CORRECT_DENSITY = True          !   [Boolean] default = True
                                 ! If true, and USE_EOS is true, the layer densities are restored toward their
                                 ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 5                  ! default = 5

ocean_only/resting/layer/MOM_parameter_doc.short

@@ -337,9 +337,6 @@ DTBT = 60.0                     !   [s or nondim] default = -0.98
 ! Parameterization of enhanced mixing due to convection via CVMix
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are restored toward their
-                                ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 
 ! === module MOM_set_diffusivity ===
 BBL_EFFIC = 0.0                 !   [nondim] default = 0.2

ocean_only/rotating_gravity_current/Layersetup_2D/MOM_input

@@ -462,10 +462,6 @@ KD = 1.0E-5                     !   [m2 s-1]
                                 ! may be used.
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
 
 ! === module MOM_tracer_hor_diff ===
 KHTR = 1.0E-4                   !   [m2 s-1] default = 0.0

ocean_only/rotating_gravity_current/Layersetup_3D/MOM_input

@@ -463,11 +463,6 @@ KD = 1.0E-5                     !   [m2 s-1]
                                 ! interior. Zero or the molecular value, ~1e-7 m2 s-1,
                                 ! may be used.
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
-
 
 ! === module MOM_tracer_hor_diff ===
 KHTR = 1.0E-4                   !   [m2 s-1] default = 0.0

ocean_only/rotating_gravity_current/Zsetup_2D/MOM_input

@@ -439,10 +439,7 @@ KD = 1.0E-5                     !   [m2 s-1]
                                 ! may be used.
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
+
 ! === module MOM_tracer_hor_diff ===
 KHTR = 1.0E-4                   !   [m2 s-1] default = 0.0
                                 ! The background along-isopycnal tracer diffusivity.

ocean_only/seamount/common/MOM_input

@@ -402,10 +402,6 @@ CONVECTION%
 %CONVECTION
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
 
 ! === module MOM_regularize_layers ===
 

ocean_only/seamount/layer/MOM_parameter_doc.all

@@ -1112,7 +1112,7 @@ USE_CVMix_CONVECTION = False    !   [Boolean] default = False
                                 ! parameters are contained in the CVMix_CONVECTION% parameter block.
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
+CORRECT_DENSITY = True          !   [Boolean] default = True
                                 ! If true, and USE_EOS is true, the layer densities are restored toward their
                                 ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 5                  ! default = 5

ocean_only/seamount/layer/MOM_parameter_doc.short

@@ -351,9 +351,6 @@ DTBT = 10.0                     !   [s or nondim] default = -0.98
 ! Parameterization of enhanced mixing due to convection via CVMix
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are restored toward their
-                                ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 
 ! === module MOM_set_diffusivity ===
 BBL_EFFIC = 0.0                 !   [nondim] default = 0.2

ocean_only/sloshing/common/MOM_input

@@ -387,10 +387,6 @@ CONVECTION%
 %CONVECTION
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
 
 ! === module MOM_regularize_layers ===
 

ocean_only/sloshing/layer/MOM_parameter_doc.all

@@ -1091,7 +1091,7 @@ USE_CVMix_CONVECTION = False    !   [Boolean] default = False
                                 ! parameters are contained in the CVMix_CONVECTION% parameter block.
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
+CORRECT_DENSITY = True          !   [Boolean] default = True
                                 ! If true, and USE_EOS is true, the layer densities are restored toward their
                                 ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 5                  ! default = 5

ocean_only/sloshing/layer/MOM_parameter_doc.short

@@ -348,9 +348,6 @@ DTBT = 10.0                     !   [s or nondim] default = -0.98
 ! Parameterization of enhanced mixing due to convection via CVMix
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are restored toward their
-                                ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 
 ! === module MOM_set_diffusivity ===
 BBL_EFFIC = 0.0                 !   [nondim] default = 0.2

ocean_only/torus_advection_test/MOM_input

@@ -394,10 +394,6 @@ CONVECTION%
 %CONVECTION
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 20                 ! default = 5
                                 ! The maximum number of iterations that may be used to
                                 ! calculate the interior diapycnal entrainment.

ocean_only/torus_advection_test/MOM_parameter_doc.all

@@ -1085,7 +1085,7 @@ USE_CVMix_CONVECTION = False    !   [Boolean] default = False
                                 ! parameters are contained in the CVMix_CONVECTION% parameter block.
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
+CORRECT_DENSITY = True          !   [Boolean] default = True
                                 ! If true, and USE_EOS is true, the layer densities are restored toward their
                                 ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 20                 ! default = 5

ocean_only/torus_advection_test/MOM_parameter_doc.short

@@ -345,9 +345,6 @@ DTBT = -0.9                     !   [s or nondim] default = -0.98
 ! Parameterization of enhanced mixing due to convection via CVMix
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are restored toward their
-                                ! target values by the diapycnal mixing, as described in Hallberg (MWR, 2000).
 MAX_ENT_IT = 20                 ! default = 5
                                 ! The maximum number of iterations that may be used to calculate the interior
                                 ! diapycnal entrainment.

ocean_only/tracer_mixing/common/MOM_input

@@ -409,10 +409,6 @@ CONVECTION%
 %CONVECTION
 
 ! === module MOM_entrain_diffusive ===
-CORRECT_DENSITY = False         !   [Boolean] default = True
-                                ! If true, and USE_EOS is true, the layer densities are
-                                ! restored toward their target values by the diapycnal
-                                ! mixing, as described in Hallberg (MWR, 2000).
 
 ! === module MOM_regularize_layers ===