Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

+*Added run time parameter MAX_TR_DIFFUSION_CFL #225

Merged
merged 2 commits into from
Apr 11, 2018
Merged

+*Added run time parameter MAX_TR_DIFFUSION_CFL #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88f0662
MOM6: +Added run time parameter MAX_TR_DIFFUSION_CFL
Hallberg-NOAA Apr 10, 2018
e472ac6
*Set MAX_TR_DIFFUSION_CFL = 2.0 in OM4_05
Hallberg-NOAA Apr 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,7 +1711,13 @@ DIFFUSE_ML_TO_INTERIOR = True ! [Boolean] default = False
CHECK_DIFFUSIVE_CFL = False ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = -1.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.
ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0
! With Diffuse_ML_interior, the ratio of the truly
! horizontal diffusivity in the mixed layer to the
Expand Down
8 changes: 7 additions & 1 deletion coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,7 +1711,13 @@ DIFFUSE_ML_TO_INTERIOR = True ! [Boolean] default = False
CHECK_DIFFUSIVE_CFL = False ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = -1.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.
ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0
! With Diffuse_ML_interior, the ratio of the truly
! horizontal diffusivity in the mixed layer to the
Expand Down
8 changes: 7 additions & 1 deletion coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,7 +1711,13 @@ DIFFUSE_ML_TO_INTERIOR = True ! [Boolean] default = False
CHECK_DIFFUSIVE_CFL = False ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = -1.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.
ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0
! With Diffuse_ML_interior, the ratio of the truly
! horizontal diffusivity in the mixed layer to the
Expand Down
8 changes: 7 additions & 1 deletion ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,7 +1711,13 @@ DIFFUSE_ML_TO_INTERIOR = True ! [Boolean] default = False
CHECK_DIFFUSIVE_CFL = False ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = -1.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.
ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0
! With Diffuse_ML_interior, the ratio of the truly
! horizontal diffusivity in the mixed layer to the
Expand Down
8 changes: 7 additions & 1 deletion ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1980,7 +1980,13 @@ DIFFUSE_ML_TO_INTERIOR = False ! [Boolean] default = False
CHECK_DIFFUSIVE_CFL = False ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = -1.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.

! === module MOM_neutral_diffusion ===
! This module implements neutral diffusion of tracers
Expand Down
8 changes: 7 additions & 1 deletion ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,7 +2015,13 @@ DIFFUSE_ML_TO_INTERIOR = False ! [Boolean] default = False
CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = -1.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.

! === module MOM_neutral_diffusion ===
! This module implements neutral diffusion of tracers
Expand Down
3 changes: 2 additions & 1 deletion ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,8 @@ TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM"
CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.

! === module MOM_neutral_diffusion ===
! This module implements neutral diffusion of tracers
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,11 @@ CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
MAX_TR_DIFFUSION_CFL = 2.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.

! === module MOM_neutral_diffusion ===
! This module implements neutral diffusion of tracers
Expand Down
8 changes: 7 additions & 1 deletion ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2028,7 +2028,13 @@ DIFFUSE_ML_TO_INTERIOR = False ! [Boolean] default = False
CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = 2.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.

! === module MOM_neutral_diffusion ===
! This module implements neutral diffusion of tracers
Expand Down
8 changes: 7 additions & 1 deletion ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,13 @@ KHTR = 200.0 ! [m2 s-1] default = 0.0
CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = 2.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.

! === module MOM_neutral_diffusion ===
! This module implements neutral diffusion of tracers
Expand Down
8 changes: 7 additions & 1 deletion ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,7 +2015,13 @@ DIFFUSE_ML_TO_INTERIOR = False ! [Boolean] default = False
CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = -1.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.

! === module MOM_neutral_diffusion ===
! This module implements neutral diffusion of tracers
Expand Down
3 changes: 2 additions & 1 deletion ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,8 @@ TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM"
CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.

! === module MOM_neutral_diffusion ===
! This module implements neutral diffusion of tracers
Expand Down
5 changes: 5 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,11 @@ CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
MAX_TR_DIFFUSION_CFL = 2.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.

! === module MOM_neutral_diffusion ===
! This module implements neutral diffusion of tracers
Expand Down
8 changes: 7 additions & 1 deletion ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2034,7 +2034,13 @@ DIFFUSE_ML_TO_INTERIOR = False ! [Boolean] default = False
CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = 2.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.

! === module MOM_neutral_diffusion ===
! This module implements neutral diffusion of tracers
Expand Down
8 changes: 7 additions & 1 deletion ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,13 @@ KHTR = 50.0 ! [m2 s-1] default = 0.0
CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = 2.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.

! === module MOM_neutral_diffusion ===
! This module implements neutral diffusion of tracers
Expand Down
8 changes: 7 additions & 1 deletion ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1728,7 +1728,13 @@ DIFFUSE_ML_TO_INTERIOR = True ! [Boolean] default = False
CHECK_DIFFUSIVE_CFL = False ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = -1.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.
ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0
! With Diffuse_ML_interior, the ratio of the truly
! horizontal diffusivity in the mixed layer to the
Expand Down
8 changes: 7 additions & 1 deletion ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1728,7 +1728,13 @@ DIFFUSE_ML_TO_INTERIOR = True ! [Boolean] default = False
CHECK_DIFFUSIVE_CFL = False ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = -1.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.
ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0
! With Diffuse_ML_interior, the ratio of the truly
! horizontal diffusivity in the mixed layer to the
Expand Down
8 changes: 7 additions & 1 deletion ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1728,7 +1728,13 @@ DIFFUSE_ML_TO_INTERIOR = True ! [Boolean] default = False
CHECK_DIFFUSIVE_CFL = False ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = -1.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.
ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0
! With Diffuse_ML_interior, the ratio of the truly
! horizontal diffusivity in the mixed layer to the
Expand Down
8 changes: 7 additions & 1 deletion land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1915,7 +1915,13 @@ DIFFUSE_ML_TO_INTERIOR = False ! [Boolean] default = False
CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False
! If true, use enough iterations the diffusion to ensure
! that the diffusive equivalent of the CFL limit is not
! violated. If false, always use 1 iteration.
! violated. If false, always use the greater of 1 or
! MAX_TR_DIFFUSION_CFL iteration.
MAX_TR_DIFFUSION_CFL = -1.0 ! [nondim] default = -1.0
! If positive, locally limit the along-isopycnal tracer
! diffusivity to keep the diffusive CFL locally at or
! below this value. The number of diffusive iterations
! is often this value or the next greater integer.

! === module MOM_neutral_diffusion ===
! This module implements neutral diffusion of tracers
Expand Down
Loading