From 7a2838281af3d7bb0a1dde5be252743c9ef738a5 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Tue, 5 Dec 2023 19:26:06 -0500 Subject: [PATCH 1/3] Update MAPL_ErrorHandling.F90 --- shared/MAPL_ErrorHandling.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/MAPL_ErrorHandling.F90 b/shared/MAPL_ErrorHandling.F90 index f2eef1f3447c..1c1707d89a43 100644 --- a/shared/MAPL_ErrorHandling.F90 +++ b/shared/MAPL_ErrorHandling.F90 @@ -240,9 +240,9 @@ logical function MAPL_VRFYt(A,text,iam,line,rc) !$omp end critical (MAPL_ErrorHandling10) end function MAPL_VRFYT - subroutine MAPL_abort + subroutine MAPL_abort() integer :: status - integer :: error_code + integer :: error_code = -1 call MPI_Abort(MPI_COMM_WORLD,error_code,status) end subroutine MAPL_abort From 2b5bbaa69ba43929bf57e2410e3efdceac4650f7 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Tue, 5 Dec 2023 19:27:30 -0500 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6897c05f14d..ea74bf4340d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- `MAPL_Abort()` was passing an uninitialized integer to `MPI_Abort()` resulting in spurious false successes when running ctest. Maybe was happening frequently, but CI would be blind to this. +- ### Removed ### Deprecated From 9981a86f5e4d383972133e94cef25130b37fff55 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 6 Dec 2023 10:51:00 -0500 Subject: [PATCH 3/3] Prepare for 2.42.3 release --- CHANGELOG.md | 8 ++++++-- CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea74bf4340d4..c3632d656b71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,12 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- `MAPL_Abort()` was passing an uninitialized integer to `MPI_Abort()` resulting in spurious false successes when running ctest. Maybe was happening frequently, but CI would be blind to this. -- ### Removed ### Deprecated +## [2.42.3] - 2023-12-06 + +### Fixed + +- `MAPL_Abort()` was passing an uninitialized integer to `MPI_Abort()` resulting in spurious false successes when running ctest. Maybe was happening frequently, but CI would be blind to this. + ## [2.42.2] - 2023-12-05 ### Fixed diff --git a/CMakeLists.txt b/CMakeLists.txt index aacbceffa2aa..a5677597e57b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ endif () project ( MAPL - VERSION 2.42.2 + VERSION 2.42.3 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF # Set the possible values of build type for cmake-gui