From 334babab24bb79a3e16696cfb6d71574f692dbe1 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 18 Dec 2025 13:59:36 -0500 Subject: [PATCH 1/3] v2: Re-fix GNU binary restart reads --- CHANGELOG.md | 6 ++++++ CMakeLists.txt | 2 +- base/BinIO.F90 | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4f2b85ad0a..37832b6e111 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Deprecated +## [2.64.1] - 2025-12-22 + +### Fixed + +- Restore workaround for binary restart reads with GNU + ## [2.64.0] - 2025-12-05 ### Added diff --git a/CMakeLists.txt b/CMakeLists.txt index af1adf84c3e..6e3e4c9fc36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/base/BinIO.F90 b/base/BinIO.F90 index 74d2ff787f7..9f43acbbe6a 100644 --- a/base/BinIO.F90 +++ b/base/BinIO.F90 @@ -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 From 9192c36cc0412a390c17d05e6e9207c7113cb271 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 18 Dec 2025 14:00:46 -0500 Subject: [PATCH 2/3] Clarify changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37832b6e111..dd28f65ea8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### 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 From 9e21fbd23afc4f8809c9ea605d9294ab812ba994 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 30 Dec 2025 18:03:46 -0500 Subject: [PATCH 3/3] Update changelog for release --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd28f65ea8a..a23bf1aad35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Deprecated -## [2.64.1] - 2025-12-22 +## [2.64.1] - 2025-12-30 ### Fixed