diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000000000000000000000000000000000000..87baee32ad1656e3f2477828743c1ee57fbbbedf --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,17 @@ +############################################################################### +# # +# Trilinos Release 11.6 Changelog # +# # +############################################################################### + +Release update 11.6.2 May 16, 2013 + +1. Stratimikos - Belos adapter now accepts magnitudeType for tolerance. + +2. Zoltan - Fixed a bug when multiple object weights are used and ParMETIS + 4.x is compiled with 64bit integers and reals. + +3. Zoltan2 - Bug fix for Xpetra graph adapter when a processor has no + vertices. + +4. Zoltan2 - Fix include guard in Zoltan2_ZpetraRowMatrixAdapter.hpp diff --git a/SIERRA/bjam/config_headers/Trilinos_version.h b/SIERRA/bjam/config_headers/Trilinos_version.h index 0d291233af27514ce693125e0dc3f04d4cce7164..3db3c065972bae58140b0295ff874b9b980d9355 100644 --- a/SIERRA/bjam/config_headers/Trilinos_version.h +++ b/SIERRA/bjam/config_headers/Trilinos_version.h @@ -121,7 +121,7 @@ * version 10.2.4 is designated 100204. This preserves the comparability of * these version numbers with simple comparison operators used in #ifdef tests. */ -#define TRILINOS_MAJOR_MINOR_VERSION 110601 +#define TRILINOS_MAJOR_MINOR_VERSION 110602 /* NOTE: These macros are given long int values to allow comparisons in * preprocessor #if statements. For example, you can do comparisons with ==, @@ -136,6 +136,6 @@ * * NOTE: This string is to be used for outputting, not for comparison logic. */ -#define TRILINOS_VERSION_STRING "11.6.1" +#define TRILINOS_VERSION_STRING "11.6.2" #endif /* TRILINOS_VERSION_H */ diff --git a/Version.cmake b/Version.cmake index a773ccbfc88ca27d3048e085dc71f6f4bc7f32cd..cda981f71d5aa8f2a29acde16ee8286b28cddfbd 100644 --- a/Version.cmake +++ b/Version.cmake @@ -59,10 +59,10 @@ # for release mode and set the version. # -SET(Trilinos_VERSION 11.6.1) +SET(Trilinos_VERSION 11.6.2) SET(Trilinos_MAJOR_VERSION 11) -SET(Trilinos_MAJOR_MINOR_VERSION 110601) -SET(Trilinos_VERSION_STRING "11.6.1") +SET(Trilinos_MAJOR_MINOR_VERSION 110602) +SET(Trilinos_VERSION_STRING "11.6.2") SET(Trilinos_ENABLE_DEVELOPMENT_MODE_DEFAULT OFF) # Change to 'OFF' for a release # Used by testing scripts and should not be used elsewhere