Skip to content

mosart1.1.13: Refactor conditional to work with ifx, which doesn't short-circuit #126

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
ekluzek merged 3 commits into from
Feb 20, 2026
Merged

mosart1.1.13: Refactor conditional to work with ifx, which doesn't short-circuit #126

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7aa48b1
Refactor conditional to work with ifx, which doesn't short-circuit
billsacks Feb 17, 2026
c016c85
Update tag
ekluzek Feb 20, 2026
a692045
Update test status
ekluzek Feb 20, 2026
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
15 changes: 8 additions & 7 deletions src/riverroute/mosart_tspatialunit_type.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,13 +363,14 @@ subroutine Init(this, begr, endr, ntracers, mosart_euler_calc, nlon, nlat, EMesh
if (this%twidth(n) < 0._r8) then
this%twidth(n) = 0._r8
end if
if ( this%tlen(n) > 0._r8 .and. &
(this%rlenTotal(n)-this%rlen(n))/this%tlen(n) > 1._r8 ) then
this%twidth(n) = c_twid(n)*this%twidth(n) * &
((this%rlenTotal(n)-this%rlen(n))/this%tlen(n))
end if
if (this%tlen(n) > 0._r8 .and. this%twidth(n) <= 0._r8) then
this%twidth(n) = 0._r8
if (this%tlen(n) > 0._r8) then
if ((this%rlenTotal(n)-this%rlen(n))/this%tlen(n) > 1._r8) then
this%twidth(n) = c_twid(n)*this%twidth(n) * &
((this%rlenTotal(n)-this%rlen(n))/this%tlen(n))
end if
if (this%twidth(n) < 0._r8) then
this%twidth(n) = 0._r8
end if
end if
else
this%hlen(n) = 0._r8
Expand Down