Skip to content

Commit

Permalink
Merge pull request trilinos#12777 from achauphan/post-15-1-version-up…
Browse files Browse the repository at this point in the history
…date

Framework: Post 15.1.0 version update
  • Loading branch information
achauphan authored Feb 29, 2024
2 parents ae5f385 + d49940c commit c501a6d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
7 changes: 6 additions & 1 deletion RELEASE_NOTES
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

###############################################################################
# #
# Trilinos Release 15.1 Release Notes TBD, 2024 #
# Trilinos Release 15.1.0 Release Notes February 26, 2024 #
# #
###############################################################################

Expand All @@ -12,6 +12,11 @@ Amesos2
https://github.com/trilinos/Trilinos/pull/12524


Framework

- Began using semantic versioning for Trilinos with 15.1.0 release.


Ifpack2

- BlockRelaxation can now generate blocks using a Zoltan2.
Expand Down
6 changes: 3 additions & 3 deletions Version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@
# for release mode and set the version.
#

SET(Trilinos_VERSION 15.1)
SET(Trilinos_VERSION 15.2.0)
SET(Trilinos_MAJOR_VERSION 15)
SET(Trilinos_MAJOR_MINOR_VERSION 150100)
SET(Trilinos_VERSION_STRING "15.1 (Dev)")
SET(Trilinos_MAJOR_MINOR_VERSION 150200)
SET(Trilinos_VERSION_STRING "15.2.0-dev")
SET(Trilinos_ENABLE_DEVELOPMENT_MODE_DEFAULT ON) # Change to 'OFF' for a release

# Used by testing scripts and should not be used elsewhere
Expand Down

0 comments on commit c501a6d

Please sign in to comment.