Skip to content

Ensure short-circuiting in Lam2 available check in mixedlayer_restart_Bodner #395

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

Merged
alperaltuntas merged 2 commits into from
Oct 24, 2025
Merged

Ensure short-circuiting in Lam2 available check in mixedlayer_restart_Bodner #395

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ac16c2
Prevent short-circuiting in Lam2 available check in mixedlayer_restra…
alperaltuntas Oct 21, 2025
437609b
don't imlicitly save lam2_available
alperaltuntas Oct 23, 2025
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
5 changes: 4 additions & 1 deletion src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,7 @@ subroutine mixedlayer_restrat_Bodner(CS, G, GV, US, h, uhtr, vhtr, tv, forces, d
logical :: line_is_empty, keep_going
integer, dimension(2) :: EOSdom ! The i-computational domain for the equation of state
integer :: i, j, k, is, ie, js, je, Isq, Ieq, Jsq, Jeq, nz
logical :: lam2_available = .false.
Copy link
Collaborator

@mnlevy1981 mnlevy1981 Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see anything about this in the style guide, but if you are going to initialize lam2_available I think you want to do it below rather than in the variable declaration to avoid implicitly save-ing it. Maybe just set it to .false. in the else block for the if (CS%wave_enhanced_ustar) then you modify below?


is = G%isc ; ie = G%iec ; js = G%jsc ; je = G%jec ; nz = GV%ke
Isq = G%IscB ; Ieq = G%IecB ; Jsq = G%JscB ; Jeq = G%JecB
Expand Down Expand Up @@ -891,7 +892,9 @@ subroutine mixedlayer_restrat_Bodner(CS, G, GV, US, h, uhtr, vhtr, tv, forces, d

! Wave Enhanced of ustar following Eq. 28 in Bodner23
if (CS%wave_enhanced_ustar) then
if (present(Lam2) .and. associated(Lam2)) then
lam2_available = present(Lam2)
if (lam2_available) lam2_available = associated(Lam2)
if (lam2_available) then
do j=js-1,je+1 ; do i=is-1,ie+1
E_ustar = sqrt( 1.0 + (Lam2(i,j) * 0.104) + (Lam2(i,j) * Lam2(i,j) * 0.00118))
U_star_2d(i,j) = E_ustar * U_star_2d(i,j)
Expand Down