Adding new Trilinos version and updating Nalu to utilize it. (#5552)

This commit is contained in:
Jon Rood 2017-09-29 15:31:15 -06:00 committed by Christoph Junghans
parent e1f33bd903
commit d19eb152c8
2 changed files with 6 additions and 3 deletions

View File

@ -35,12 +35,14 @@ class Nalu(CMakePackage):
homepage = "https://github.com/NaluCFD/Nalu" homepage = "https://github.com/NaluCFD/Nalu"
url = "https://github.com/NaluCFD/Nalu.git" url = "https://github.com/NaluCFD/Nalu.git"
maintainers = ['jrood-nrel']
version('master', version('master',
git='https://github.com/NaluCFD/Nalu.git', branch='master') git='https://github.com/NaluCFD/Nalu.git', branch='master')
# Currently Nalu only builds static libraries; To be fixed soon # Currently Nalu only builds static libraries; To be fixed soon
depends_on('yaml-cpp+pic~shared') depends_on('yaml-cpp+pic~shared@0.5.3:')
depends_on('trilinos~shared+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf@master') depends_on('trilinos~shared+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards@master,12.12.1:')
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec

View File

@ -44,7 +44,7 @@ class Trilinos(CMakePackage):
A unique design feature of Trilinos is its focus on packages. A unique design feature of Trilinos is its focus on packages.
""" """
homepage = "https://trilinos.org/" homepage = "https://trilinos.org/"
url = "https://github.com/trilinos/Trilinos/archive/trilinos-release-12-10-1.tar.gz" url = "https://github.com/trilinos/Trilinos/archive/trilinos-release-12-12-1.tar.gz"
maintainers = ['aprokop'] maintainers = ['aprokop']
@ -56,6 +56,7 @@ class Trilinos(CMakePackage):
git='https://github.com/trilinos/Trilinos.git', tag='develop') git='https://github.com/trilinos/Trilinos.git', tag='develop')
version('master', version('master',
git='https://github.com/trilinos/Trilinos.git', tag='master') git='https://github.com/trilinos/Trilinos.git', tag='master')
version('12.12.1', 'ecd4606fa332212433c98bf950a69cc7')
version('12.10.1', '667333dbd7c0f031d47d7c5511fd0810') version('12.10.1', '667333dbd7c0f031d47d7c5511fd0810')
version('12.8.1', '01c0026f1e2050842857db941060ecd5') version('12.8.1', '01c0026f1e2050842857db941060ecd5')
version('12.6.4', 'c2ea7b5aa0d10bcabdb9b9a6e3bac3ea') version('12.6.4', 'c2ea7b5aa0d10bcabdb9b9a6e3bac3ea')