From 5c9f52b4a89ea8400659f495cbdaf235a7400f27 Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Thu, 21 May 2020 15:14:15 -0400 Subject: [PATCH] *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 | 3 --- ice_ocean_SIS/GIS_0125/MOM_input | 3 --- ocean_only/ISOMIP/layer/MOM_input | 4 ---- ocean_only/ISOMIP/rho/MOM_input | 4 ---- ocean_only/MESO_025_23L/MOM_input | 3 --- ocean_only/adjustment2d/common/MOM_input | 4 ---- ocean_only/adjustment2d/layer/MOM_parameter_doc.all | 2 +- ocean_only/adjustment2d/layer/MOM_parameter_doc.short | 3 --- ocean_only/external_gwave/MOM_input | 4 ---- ocean_only/external_gwave/MOM_parameter_doc.all | 2 +- ocean_only/external_gwave/MOM_parameter_doc.short | 3 --- ocean_only/flow_downslope/common/MOM_input | 4 ---- ocean_only/flow_downslope/layer/MOM_parameter_doc.all | 2 +- ocean_only/flow_downslope/layer/MOM_parameter_doc.short | 3 --- ocean_only/lock_exchange/MOM_input | 4 ---- ocean_only/lock_exchange/MOM_parameter_doc.all | 2 +- ocean_only/lock_exchange/MOM_parameter_doc.short | 3 --- ocean_only/mixed_layer_restrat_2d/MOM_input | 4 ---- ocean_only/resting/common/MOM_input | 4 ---- ocean_only/resting/layer/MOM_parameter_doc.all | 2 +- ocean_only/resting/layer/MOM_parameter_doc.short | 3 --- ocean_only/rotating_gravity_current/Layersetup_2D/MOM_input | 4 ---- ocean_only/rotating_gravity_current/Layersetup_3D/MOM_input | 5 ----- ocean_only/rotating_gravity_current/Zsetup_2D/MOM_input | 5 +---- ocean_only/seamount/common/MOM_input | 4 ---- ocean_only/seamount/layer/MOM_parameter_doc.all | 2 +- ocean_only/seamount/layer/MOM_parameter_doc.short | 3 --- ocean_only/sloshing/common/MOM_input | 4 ---- ocean_only/sloshing/layer/MOM_parameter_doc.all | 2 +- ocean_only/sloshing/layer/MOM_parameter_doc.short | 3 --- ocean_only/torus_advection_test/MOM_input | 4 ---- ocean_only/torus_advection_test/MOM_parameter_doc.all | 2 +- ocean_only/torus_advection_test/MOM_parameter_doc.short | 3 --- ocean_only/tracer_mixing/common/MOM_input | 4 ---- 34 files changed, 9 insertions(+), 102 deletions(-) diff --git a/ice_ocean_SIS/Amery/MOM_input b/ice_ocean_SIS/Amery/MOM_input index c92f46911e..16242ca2d9 100644 --- a/ice_ocean_SIS/Amery/MOM_input +++ b/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 diff --git a/ice_ocean_SIS/GIS_0125/MOM_input b/ice_ocean_SIS/GIS_0125/MOM_input index b7943119bc..f4e985a689 100644 --- a/ice_ocean_SIS/GIS_0125/MOM_input +++ b/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 diff --git a/ocean_only/ISOMIP/layer/MOM_input b/ocean_only/ISOMIP/layer/MOM_input index d76a080e3a..de06ff749c 100644 --- a/ocean_only/ISOMIP/layer/MOM_input +++ b/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. diff --git a/ocean_only/ISOMIP/rho/MOM_input b/ocean_only/ISOMIP/rho/MOM_input index d410e8fbe3..f60ae614ba 100644 --- a/ocean_only/ISOMIP/rho/MOM_input +++ b/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. diff --git a/ocean_only/MESO_025_23L/MOM_input b/ocean_only/MESO_025_23L/MOM_input index 08b2d11a8b..a3e3cf82ac 100644 --- a/ocean_only/MESO_025_23L/MOM_input +++ b/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 diff --git a/ocean_only/adjustment2d/common/MOM_input b/ocean_only/adjustment2d/common/MOM_input index f5dc28af65..f170495e02 100644 --- a/ocean_only/adjustment2d/common/MOM_input +++ b/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 === diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index e979d24f8b..602fe2fb86 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/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 diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short index b3d8f1281d..2901752441 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short +++ b/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 diff --git a/ocean_only/external_gwave/MOM_input b/ocean_only/external_gwave/MOM_input index 45359f1f59..25653a1a46 100644 --- a/ocean_only/external_gwave/MOM_input +++ b/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. diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 637d31c304..43ecb69aa6 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/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 diff --git a/ocean_only/external_gwave/MOM_parameter_doc.short b/ocean_only/external_gwave/MOM_parameter_doc.short index 0d3eb6754c..f1b24a4f95 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.short +++ b/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. diff --git a/ocean_only/flow_downslope/common/MOM_input b/ocean_only/flow_downslope/common/MOM_input index fc2037eb29..9bd5db4f5b 100644 --- a/ocean_only/flow_downslope/common/MOM_input +++ b/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 === diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index be1d8e937e..798e5ee7d3 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/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 diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short index 58537a28f8..1681ebcc6d 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short +++ b/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 === diff --git a/ocean_only/lock_exchange/MOM_input b/ocean_only/lock_exchange/MOM_input index 37aa18b67f..9a6586998d 100644 --- a/ocean_only/lock_exchange/MOM_input +++ b/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. diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 374e2615fc..1160c0e93e 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/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 diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.short b/ocean_only/lock_exchange/MOM_parameter_doc.short index 1d7ee488fb..aa8b13cec8 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.short +++ b/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. diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_input b/ocean_only/mixed_layer_restrat_2d/MOM_input index c12d8ad08d..4e20b64da3 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_input +++ b/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 === diff --git a/ocean_only/resting/common/MOM_input b/ocean_only/resting/common/MOM_input index 95dc32fab9..b6e426c0d4 100644 --- a/ocean_only/resting/common/MOM_input +++ b/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 === diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index c3bf7a42a9..9a7d076bfb 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/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 diff --git a/ocean_only/resting/layer/MOM_parameter_doc.short b/ocean_only/resting/layer/MOM_parameter_doc.short index 22b9a4fa10..cf16a2bef9 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.short +++ b/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 diff --git a/ocean_only/rotating_gravity_current/Layersetup_2D/MOM_input b/ocean_only/rotating_gravity_current/Layersetup_2D/MOM_input index 7d91d39e6b..aa9ab2bbb4 100644 --- a/ocean_only/rotating_gravity_current/Layersetup_2D/MOM_input +++ b/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 diff --git a/ocean_only/rotating_gravity_current/Layersetup_3D/MOM_input b/ocean_only/rotating_gravity_current/Layersetup_3D/MOM_input index f09695dd9d..3093b1e0bf 100644 --- a/ocean_only/rotating_gravity_current/Layersetup_3D/MOM_input +++ b/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 diff --git a/ocean_only/rotating_gravity_current/Zsetup_2D/MOM_input b/ocean_only/rotating_gravity_current/Zsetup_2D/MOM_input index 9d24bbc6a9..287b2d85e3 100644 --- a/ocean_only/rotating_gravity_current/Zsetup_2D/MOM_input +++ b/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. diff --git a/ocean_only/seamount/common/MOM_input b/ocean_only/seamount/common/MOM_input index 2c6fb5cb4f..0ba72a0097 100644 --- a/ocean_only/seamount/common/MOM_input +++ b/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 === diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 095dada414..296d5e4b02 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/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 diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.short b/ocean_only/seamount/layer/MOM_parameter_doc.short index 4f6cbea31a..6183b86e3f 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.short +++ b/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 diff --git a/ocean_only/sloshing/common/MOM_input b/ocean_only/sloshing/common/MOM_input index 2efd2beb36..8615a419eb 100644 --- a/ocean_only/sloshing/common/MOM_input +++ b/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 === diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 46de2d1e07..e9840c8446 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/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 diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.short b/ocean_only/sloshing/layer/MOM_parameter_doc.short index 7d7a037eb7..8e17c2425d 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.short +++ b/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 diff --git a/ocean_only/torus_advection_test/MOM_input b/ocean_only/torus_advection_test/MOM_input index 42ec4f608b..0bad456a85 100644 --- a/ocean_only/torus_advection_test/MOM_input +++ b/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. diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index e6d7f646b0..db6113bde6 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/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 diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.short b/ocean_only/torus_advection_test/MOM_parameter_doc.short index 572559052f..14efca08dd 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.short +++ b/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. diff --git a/ocean_only/tracer_mixing/common/MOM_input b/ocean_only/tracer_mixing/common/MOM_input index 1e5c90e49d..b359f4c17e 100644 --- a/ocean_only/tracer_mixing/common/MOM_input +++ b/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 ===