Skip to content

Auto GitFlow - main → develop #4281

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
mathomp4 merged 4 commits into from
Dec 30, 2025
Merged

Auto GitFlow - main → develop #4281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
334baba
v2: Re-fix GNU binary restart reads
mathomp4 Dec 18, 2025
9192c36
Clarify changelog
mathomp4 Dec 18, 2025
924c3b1
Merge pull request #4272 from GEOS-ESM/hotfix/fix-gnu-binary-read
mathomp4 Dec 30, 2025
9e21fbd
Update changelog for release
mathomp4 Dec 30, 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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [2.64.1] - 2025-12-30

### Fixed

- Restore workaround for binary restart reads with GNU
- Brings back changes from PR #1038: Added a workaround for a gfortran bug that handles end-of-file incorrectly (returns IOSTAT=5001).

## [2.64.0] - 2025-12-05

### Added
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ endif ()

project (
MAPL
VERSION 2.64.0
VERSION 2.64.1
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

# Set the possible values of build type for cmake-gui
Expand Down
6 changes: 6 additions & 0 deletions base/BinIO.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,12 @@ subroutine MAPL_FieldRead(UNIT,FIELD, ARRDES, HomePE, ignoreEOF, RC)
call MAPL_CommsBcast(layout, status, n=1, ROOT=MAPL_Root, rc=stat)
_VERIFY(STAT)

#ifdef __GFORTRAN__
if (status == 5001) then
_RETURN(ESMF_SUCCESS)
end if
#endif

if (status == IOSTAT_END) then
_RETURN(ESMF_SUCCESS)
end if
Expand Down
Loading