Skip to content

Fixes for ifx compiler #393

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
billsacks merged 2 commits into from
Feb 27, 2026
Merged

Fixes for ifx compiler #393

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
640c554
Refactor some conditionals to make ifx happier
billsacks Feb 18, 2026
c2c83bd
Refactor to avoid comparisons with NaN, to make ifx happy
billsacks Feb 19, 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
82 changes: 49 additions & 33 deletions streams/dshr_strdata_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1836,21 +1836,25 @@ subroutine shr_strdata_readstrm(sdat, per_stream, stream, fldbun_data, &
end if
if (handlefill) then
! Single point streams are not allowed to have missing values
if (stream%mapalgo == 'none' .and. any(data_real2d == fillvalue_r4)) then
write(errmsg,'(2a)')' ERROR: _Fillvalue found in stream input variable: ',&
trim(per_stream%fldlist_stream(nf))
if (sdat%mainproc) then
write(sdat%logunit,'(2a)') subname,trim(errmsg)
if (stream%mapalgo == 'none') then
if (any(data_real2d == fillvalue_r4)) then
write(errmsg,'(2a)')' ERROR: _Fillvalue found in stream input variable: ',&
trim(per_stream%fldlist_stream(nf))
if (sdat%mainproc) then
write(sdat%logunit,'(2a)') subname,trim(errmsg)
end if
call shr_log_error(errmsg, rc=rc)
return
end if
call shr_log_error(errmsg, rc=rc)
return
endif
do lev = 1,stream_nlev
do n = 1,size(dataptr2d, dim=2)
if (.not. shr_infnan_isnan(data_real2d(n,lev)) .and. data_real2d(n,lev) .ne. fillvalue_r4) then
dataptr2d(lev,n) = real(data_real2d(n,lev), kind=r8) ! Note the order of indices
else
if (shr_infnan_isnan(data_real2d(n,lev))) then
dataptr2d(lev,n) = r8fill
else if (data_real2d(n,lev) == fillvalue_r4) then
dataptr2d(lev,n) = r8fill
else
dataptr2d(lev,n) = real(data_real2d(n,lev), kind=r8) ! Note the order of indices
endif
enddo
end do
Expand All @@ -1874,20 +1878,24 @@ subroutine shr_strdata_readstrm(sdat, per_stream, stream, fldbun_data, &
end if
if (handlefill) then
! Single point streams are not allowed to have missing values
if (stream%mapalgo == 'none' .and. any(data_real1d == fillvalue_r4)) then
write (errmsg,'(2a)')' ERROR: _Fillvalue found in stream input variable: ',trim(per_stream%fldlist_stream(nf))
if (sdat%mainproc) then
write(sdat%logunit,'(2a)') subname,trim(errmsg)
if (stream%mapalgo == 'none') then
if (any(data_real1d == fillvalue_r4)) then
write (errmsg,'(2a)')' ERROR: _Fillvalue found in stream input variable: ',trim(per_stream%fldlist_stream(nf))
if (sdat%mainproc) then
write(sdat%logunit,'(2a)') subname,trim(errmsg)
end if
call shr_log_error(errmsg, rc=rc)
return
end if
call shr_log_error(errmsg, rc=rc)
return
endif

do n=1,size(dataptr1d)
if(.not. shr_infnan_isnan(data_real1d(n)) .and. data_real1d(n) .ne. fillvalue_r4) then
dataptr1d(n) = real(data_real1d(n), kind=r8)
else
if (shr_infnan_isnan(data_real1d(n))) then
dataptr1d(n) = r8fill
else if (data_real1d(n) == fillvalue_r4) then
dataptr1d(n) = r8fill
else
dataptr1d(n) = real(data_real1d(n), kind=r8)
endif
enddo
else
Expand All @@ -1912,17 +1920,21 @@ subroutine shr_strdata_readstrm(sdat, per_stream, stream, fldbun_data, &
end if
if (handlefill) then
! Single point streams are not allowed to have missing values
if (stream%mapalgo == 'none' .and. any(data_dbl2d == fillvalue_r8)) then
write(errmsg,*) ' ERROR: _Fillvalue found in stream input variable: '// trim(per_stream%fldlist_stream(nf))
call shr_log_error(errmsg, rc=rc)
return
if (stream%mapalgo == 'none') then
if (any(data_dbl2d == fillvalue_r8)) then
write(errmsg,*) ' ERROR: _Fillvalue found in stream input variable: '// trim(per_stream%fldlist_stream(nf))
call shr_log_error(errmsg, rc=rc)
return
end if
endif
do lev = 1,stream_nlev
do n = 1,size(dataptr2d, dim=2)
if (.not. shr_infnan_isnan(data_dbl2d(n,lev)) .and. data_dbl2d(n,lev) .ne. fillvalue_r8) then
dataptr2d(lev,n) = data_dbl2d(n,lev)
else
if (shr_infnan_isnan(data_dbl2d(n,lev))) then
dataptr2d(lev,n) = r8fill
else if (data_dbl2d(n,lev) == fillvalue_r8) then
dataptr2d(lev,n) = r8fill
else
dataptr2d(lev,n) = data_dbl2d(n,lev)
endif
enddo
end do
Expand All @@ -1946,16 +1958,20 @@ subroutine shr_strdata_readstrm(sdat, per_stream, stream, fldbun_data, &
end if
if (handlefill) then
! Single point streams are not allowed to have missing values
if (stream%mapalgo == 'none' .and. any(data_dbl1d == fillvalue_r8)) then
write(errmsg,*) ' ERROR: _Fillvalue found in stream input variable: '// trim(per_stream%fldlist_stream(nf))
call shr_log_error(subname//trim(errmsg), rc=rc)
return
if (stream%mapalgo == 'none') then
if (any(data_dbl1d == fillvalue_r8)) then
write(errmsg,*) ' ERROR: _Fillvalue found in stream input variable: '// trim(per_stream%fldlist_stream(nf))
call shr_log_error(subname//trim(errmsg), rc=rc)
return
end if
endif
do n = 1,size(dataptr1d)
if (.not. shr_infnan_isnan(data_dbl1d(n)) .and. data_dbl1d(n) .ne. fillvalue_r8) then
dataptr1d(n) = data_dbl1d(n)
else
if (shr_infnan_isnan(data_dbl1d(n))) then
dataptr1d(n) = r8fill
else if (data_dbl1d(n) == fillvalue_r8) then
dataptr1d(n) = r8fill
else
dataptr1d(n) = data_dbl1d(n)
end if
enddo
else
Expand Down