From 717ffeef16c181762c1c9fc26b815290ea3076ea Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Wed, 8 Jan 2025 09:42:52 -0500 Subject: [PATCH] add trilinos 15&16 --- candi.cfg | 7 ++----- deal.II-toolchain/packages/trilinos.package | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/candi.cfg b/candi.cfg index 7f4866d..724c3ea 100644 --- a/candi.cfg +++ b/candi.cfg @@ -98,12 +98,9 @@ DEAL_II_VERSION=v9.6.1 ######################################################################### -# If you want to use Trilinos, decide which major version to use +# If you want to use Trilinos, decide which major version to use. +# Valid options: AUTO,16,15,14,13,12,11 TRILINOS_MAJOR_VERSION=AUTO -#TRILINOS_MAJOR_VERSION=14 -#TRILINOS_MAJOR_VERSION=13 -#TRILINOS_MAJOR_VERSION=12 -#TRILINOS_MAJOR_VERSION=11 # If enabled, Trilinos is configured with complex number support in # Teuchos and Tpetra. This takes a long time to compile and requires a diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package index 84783c3..979527f 100644 --- a/deal.II-toolchain/packages/trilinos.package +++ b/deal.II-toolchain/packages/trilinos.package @@ -11,6 +11,8 @@ if [ ${TRILINOS_MAJOR_VERSION} = "AUTO" ]; then fi if [ ${TRILINOS_MAJOR_VERSION} = "DEV" ];then + + # this is very much out of date # download from github: # this is the last "blessed" version we like: VERSION=dbf41f3b26b0326a1377f219e6e07eab861d181e @@ -19,6 +21,23 @@ if [ ${TRILINOS_MAJOR_VERSION} = "DEV" ];then NAME=Trilinos.git PACKING=git SOURCE=https://github.com/trilinos/ +elif [ ${TRILINOS_MAJOR_VERSION} = "16" ]; then + + VERSION=16-0-0;CHECKSUM=e6d83f7980800a3aad1b7cab6b901fd5 + + SOURCE=https://github.com/trilinos/Trilinos/archive/ + NAME=trilinos-release-${VERSION} + EXTRACTSTO=Trilinos-trilinos-release-${VERSION} + PACKING=.tar.gz +elif [ ${TRILINOS_MAJOR_VERSION} = "15" ]; then + + # broken, at least with gcc 13.3, but we'll leave it here: + VERSION=15-1-1;CHECKSUM=99542eebbf2dadefdea7b6a21af68c89 + + SOURCE=https://github.com/trilinos/Trilinos/archive/ + NAME=trilinos-release-${VERSION} + EXTRACTSTO=Trilinos-trilinos-release-${VERSION} + PACKING=.tar.gz elif [ ${TRILINOS_MAJOR_VERSION} = "14" ]; then VERSION=14-4-0;CHECKSUM=334f9c3700c72f6ed5658eaa783ffccd -- 2.39.5