Skip to content
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

Jump to bottom

Auto GitFlow - main → develop #2480

Merged
merged 5 commits into from
Dec 6, 2023
Merged

Auto GitFlow - main → develop #2480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a28382
Update MAPL_ErrorHandling.F90
tclune Dec 6, 2023
2b5bbaa
Update CHANGELOG.md
tclune Dec 6, 2023
0054b66
Merge pull request #2479 from GEOS-ESM/hotfix/tclune/#2478-mapl-abort
tclune Dec 6, 2023
9981a86
Prepare for 2.42.3 release
mathomp4 Dec 6, 2023
9e0f2d1
Merge pull request #2481 from GEOS-ESM/feature/mathomp4/prepare-2.42.…
mathomp4 Dec 6, 2023
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
6 changes: 6 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,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### 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
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.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
Expand Down
4 changes: 2 additions & 2 deletions shared/MAPL_ErrorHandling.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down