diff options
| author | Jon Rood <jon.rood@nrel.gov> | 2017-09-29 15:31:15 -0600 |
|---|---|---|
| committer | Christoph Junghans <christoph.junghans@gmail.com> | 2017-09-29 15:31:15 -0600 |
| commit | d19eb152c8c199007cebb6975633eec74ba7a132 (patch) | |
| tree | f11ccfc6fe0dafcd0034ee20cd25c0e063278176 | |
| parent | e1f33bd90389093e88952035c707ee8adf55ddb7 (diff) | |
| download | spack-d19eb152c8c199007cebb6975633eec74ba7a132.tar.gz spack-d19eb152c8c199007cebb6975633eec74ba7a132.tar.bz2 spack-d19eb152c8c199007cebb6975633eec74ba7a132.tar.xz spack-d19eb152c8c199007cebb6975633eec74ba7a132.zip | |
Adding new Trilinos version and updating Nalu to utilize it. (#5552)
| -rw-r--r-- | var/spack/repos/builtin/packages/nalu/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index a8eb4d4557..5104bd0e48 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -35,12 +35,14 @@ class Nalu(CMakePackage): homepage = "https://github.com/NaluCFD/Nalu" url = "https://github.com/NaluCFD/Nalu.git" + maintainers = ['jrood-nrel'] + version('master', git='https://github.com/NaluCFD/Nalu.git', branch='master') # Currently Nalu only builds static libraries; To be fixed soon - depends_on('yaml-cpp+pic~shared') - depends_on('trilinos~shared+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf@master') + 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+shards@master,12.12.1:') def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 67567ccb82..375309207f 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -44,7 +44,7 @@ class Trilinos(CMakePackage): A unique design feature of Trilinos is its focus on packages. """ 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'] @@ -56,6 +56,7 @@ class Trilinos(CMakePackage): git='https://github.com/trilinos/Trilinos.git', tag='develop') version('master', git='https://github.com/trilinos/Trilinos.git', tag='master') + version('12.12.1', 'ecd4606fa332212433c98bf950a69cc7') version('12.10.1', '667333dbd7c0f031d47d7c5511fd0810') version('12.8.1', '01c0026f1e2050842857db941060ecd5') version('12.6.4', 'c2ea7b5aa0d10bcabdb9b9a6e3bac3ea') |