Skip to content

Commit a6f6e90

Browse files
authored
Merge pull request #126 from billsacks/fixes_for_ifx
mosart1.1.13: Refactor conditional to work with ifx, which doesn't short-circuit
2 parents 0faa624 + a692045 commit a6f6e90

2 files changed

Lines changed: 24 additions & 7 deletions

File tree

docs/ChangeLog.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
<hr>
2+
# Tag name: mosart1.1.13
3+
### Originator(s): billsacks / ekluzek
4+
### Date: Feb 20, 2026
5+
### One-line Summary: Fixes needed to work with the ifx compiler
6+
7+
Resolves issue https://github.com/ESCOMP/MOSART/issues/125
8+
9+
Testing: standard testing
10+
izumi ---- PASS
11+
derecho -- PASS
12+
13+
More details in the PRs:
14+
https://github.com/ESCOMP/MOSART/pull/126
15+
16+
<hr>
17+
<hr>
218
# Tag name: mosart1.1.12
319
### Originator(s): slevis
420
### Date: Jul 31, 2025

src/riverroute/mosart_tspatialunit_type.F90

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -363,13 +363,14 @@ subroutine Init(this, begr, endr, ntracers, mosart_euler_calc, nlon, nlat, EMesh
363363
if (this%twidth(n) < 0._r8) then
364364
this%twidth(n) = 0._r8
365365
end if
366-
if ( this%tlen(n) > 0._r8 .and. &
367-
(this%rlenTotal(n)-this%rlen(n))/this%tlen(n) > 1._r8 ) then
368-
this%twidth(n) = c_twid(n)*this%twidth(n) * &
369-
((this%rlenTotal(n)-this%rlen(n))/this%tlen(n))
370-
end if
371-
if (this%tlen(n) > 0._r8 .and. this%twidth(n) <= 0._r8) then
372-
this%twidth(n) = 0._r8
366+
if (this%tlen(n) > 0._r8) then
367+
if ((this%rlenTotal(n)-this%rlen(n))/this%tlen(n) > 1._r8) then
368+
this%twidth(n) = c_twid(n)*this%twidth(n) * &
369+
((this%rlenTotal(n)-this%rlen(n))/this%tlen(n))
370+
end if
371+
if (this%twidth(n) < 0._r8) then
372+
this%twidth(n) = 0._r8
373+
end if
373374
end if
374375
else
375376
this%hlen(n) = 0._r8

0 commit comments

Comments
 (0)