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

Avoid FATAL for allowed combination of options #568

Merged
merged 1 commit into from
Aug 7, 2017
Merged

Avoid FATAL for allowed combination of options #568

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions src/parameterizations/lateral/MOM_MEKE.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,9 +953,6 @@ logical function MEKE_init(Time, G, param_file, diag, CS, MEKE, restart_CS)
if (CS%viscosity_coeff/=0. .and. .not. laplacian) call MOM_error(FATAL, &
"LAPLACIAN must be true if MEKE_VISCOSITY_COEFF is true.")

call get_param(param_file, mdl, "USE_VARIABLE_MIXING", useVarMix, default=.false., do_not_log=.true.)
if (.not. useVarMix .and. CS%aEady>0.) call MOM_error(FATAL, &
"USE_VARIABLE_MIXING must be true if USE_MEKE is true and MEKE_ALPHA_EADY>0.")
call get_param(param_file, mdl, "DEBUG", CS%debug, default=.false., do_not_log=.true.)

! Allocation of storage NOT shared with other modules
Expand Down