From: Marc Fehling Date: Fri, 29 Nov 2024 12:56:59 +0000 (+0100) Subject: Bump minimum version for Trilinos to 12.14.1. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2e9fd42d02604e4bca12fddf65629264706879b;p=dealii.git Bump minimum version for Trilinos to 12.14.1. --- diff --git a/cmake/configure/configure_20_trilinos.cmake b/cmake/configure/configure_20_trilinos.cmake index e5a45f964f..949917d50f 100644 --- a/cmake/configure/configure_20_trilinos.cmake +++ b/cmake/configure/configure_20_trilinos.cmake @@ -79,17 +79,17 @@ macro(feature_trilinos_find_external var) endif() # - # We require at least Trilinos 12.4 + # We require at least Trilinos 12.14.1 # - if(TRILINOS_VERSION VERSION_LESS 12.4) + if(TRILINOS_VERSION VERSION_LESS 12.14.1) message(STATUS "Could not find a sufficient Trilinos installation: " - "deal.II requires at least version 12.4, but version ${TRILINOS_VERSION} was found." + "deal.II requires at least version 12.14.1, but version ${TRILINOS_VERSION} was found." ) set(TRILINOS_ADDITIONAL_ERROR_STRING ${TRILINOS_ADDITIONAL_ERROR_STRING} "The Trilinos installation (found at \"${TRILINOS_DIR}\")\n" "with version ${TRILINOS_VERSION} is too old.\n" - "deal.II requires at least version 12.4.\n\n" + "deal.II requires at least version 12.14.1.\n\n" ) set(${var} FALSE) endif() @@ -194,23 +194,6 @@ macro(feature_trilinos_find_external var) "includes Kokkos, but DEAL_II_FORCE_BUNDLED_KOKKOS=ON!\n") set(${var} FALSE) endif() - - # - # We require at least Trilinos 12.14.1 - # - if(TRILINOS_VERSION VERSION_LESS 12.14.1) - message(STATUS "Could not find a sufficient Trilinos installation: " - "deal.II requires at least version 12.14.1 if the Trilinos installation includes Kokkos, " - "but version ${TRILINOS_VERSION} was found." - ) - set(TRILINOS_ADDITIONAL_ERROR_STRING - ${TRILINOS_ADDITIONAL_ERROR_STRING} - "The Trilinos installation (found at \"${TRILINOS_DIR}\")\n" - "with version ${TRILINOS_VERSION} is too old.\n" - "deal.II requires at least version 12.14.1 if the Trilinos installation includes Kokkos.\n\n" - ) - set(${var} FALSE) - endif() endif() if(TRILINOS_WITH_KOKKOS AND Kokkos_ENABLE_CUDA) @@ -223,25 +206,6 @@ macro(feature_trilinos_find_external var) KOKKOS_CHECK(OPTIONS CUDA_LAMBDA) endif() - if(TRILINOS_WITH_ROL) - # - # We require at least Trilinos 12.14.1 - # - if(TRILINOS_VERSION VERSION_LESS 12.14.1) - message(STATUS "Could not find a sufficient Trilinos installation: " - "deal.II requires at least version 12.14.1 if the Trilinos installation includes ROL, " - "but version ${TRILINOS_VERSION} was found." - ) - set(TRILINOS_ADDITIONAL_ERROR_STRING - ${TRILINOS_ADDITIONAL_ERROR_STRING} - "The Trilinos installation (found at \"${TRILINOS_DIR}\")\n" - "with version ${TRILINOS_VERSION} is too old.\n" - "deal.II requires at least version 12.14.1 if the Trilinos installation includes ROL.\n\n" - ) - set(${var} FALSE) - endif() - endif() - if(TRILINOS_WITH_TPETRA) # # Check if Tpetra is usable in fact. diff --git a/doc/external-libs/trilinos.html b/doc/external-libs/trilinos.html index 0fb3abefde..8f4710d62a 100644 --- a/doc/external-libs/trilinos.html +++ b/doc/external-libs/trilinos.html @@ -49,9 +49,8 @@
Installing Trilinos

- Note: The current version of deal.II requires at least Trilinos 12.4 - (12.14.1 if Trilinos includes Kokkos). - Deal.II is known to work with Trilinos up to 13.4. Other versions of + Note: The current version of deal.II requires at least Trilinos 12.14.1. + Deal.II is known to work with Trilinos up to 16.0.0. Other versions of Trilinos should work too but have not been tested prior to the release.

diff --git a/doc/news/changes/incompatibilities/20241128Fehling1 b/doc/news/changes/incompatibilities/20241128Fehling1 index 0780693ff8..86a1a90d2c 100644 --- a/doc/news/changes/incompatibilities/20241128Fehling1 +++ b/doc/news/changes/incompatibilities/20241128Fehling1 @@ -1,4 +1,3 @@ -Changed: The minimum version for Trilinos has been bumped to 12.14.1 -if Trilinos bundles ROL. +Changed: The minimum version for Trilinos has been bumped to 12.14.1.
(Marc Fehling, 2024/11/28)