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

(*)Fix bug in CVMix_shear_is_used if USE_PP81=True #323

Merged
merged 2 commits into from
Feb 15, 2023
Merged

(*)Fix bug in CVMix_shear_is_used if USE_PP81=True #323

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
a9ee8d3
(*)Fix bug in CVMix_shear_is_used if USE_PP81=True
Hallberg-NOAA Feb 8, 2023
84426ff
Merge branch 'dev/gfdl' into fix_CVMIX_shear_is_used_bug
marshallward Feb 13, 2023
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: 2 additions & 1 deletion src/diagnostics/MOM_obsolete_params.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ subroutine find_obsolete_params(param_file)

call obsolete_logical(param_file, "MSTAR_FIXED", hint="Instead use MSTAR_MODE.")
call obsolete_logical(param_file, "USE_VISBECK_SLOPE_BUG", .false.)
call obsolete_logical(param_file, "Use_PP81", hint="get_param is case sensitive so use USE_PP81.")

call obsolete_logical(param_file, "ALLOW_CLOCKS_IN_OMP_LOOPS", .true.)
call obsolete_logical(param_file, "LARGE_FILE_SUPPORT", .true.)
Expand All @@ -114,7 +115,7 @@ subroutine obsolete_logical(param_file, varname, warning_val, hint)
logical :: test_logic, fatal_err
character(len=128) :: hint_msg

test_logic = .false. ; call read_param(param_file, varname,test_logic)
test_logic = .false. ; call read_param(param_file, varname, test_logic)
fatal_err = .true.
if (present(warning_val)) fatal_err = (warning_val .neqv. .true.)
hint_msg = " " ; if (present(hint)) hint_msg = hint
Expand Down
8 changes: 4 additions & 4 deletions src/parameterizations/vertical/MOM_CVMix_shear.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,17 +318,17 @@ logical function CVMix_shear_init(Time, G, GV, US, param_file, diag, CS)

end function CVMix_shear_init

!> Reads the parameters "LMD94" and "PP81" and returns state.
!> Reads the parameters "USE_LMD94" and "USE_PP81" and returns true if either is true.
!! This function allows other modules to know whether this parameterization will
!! be used without needing to duplicate the log entry.
logical function CVMix_shear_is_used(param_file)
type(param_file_type), intent(in) :: param_file !< Run-time parameter files handle.
! Local variables
logical :: LMD94, PP81
call get_param(param_file, mdl, "USE_LMD94", LMD94, &
default=.false., do_not_log=.true.)
call get_param(param_file, mdl, "Use_PP81", PP81, &
default=.false., do_not_log=.true.)
default=.false., do_not_log=.true.)
call get_param(param_file, mdl, "USE_PP81", PP81, &
default=.false., do_not_log=.true.)
CVMix_shear_is_used = (LMD94 .or. PP81)
end function CVMix_shear_is_used

Expand Down