Skip to content

Commit

Permalink
Merge pull request #22 from xylar/add-compass-albany-and-trilinos-tags
Browse files Browse the repository at this point in the history
Add compass tags to albany and trilinos-for-albany packages
  • Loading branch information
xylar authored Oct 5, 2023
2 parents 4e5c335 + 7c87f90 commit 82a2820
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions var/spack/repos/builtin/packages/albany/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class Albany(CMakePackage):

maintainers("ikalash")

version('compass-2023-08-03', tag='compass-2023-08-03')
version("develop", branch="master")

variant("debug", default=False,
Expand Down Expand Up @@ -75,6 +76,7 @@ class Albany(CMakePackage):
depends_on("trilinos-for-albany~superlu-dist+exodus+chaco~isorropia+tempus+teko~intrepid+intrepid2+minitensor+phalanx+pnetcdf+nox+piro+shards+stk+amesos2~amesos~hypre+ifpack2~mumps~suite-sparse+sandybridge~epetra~ifpack~ml+muelu~aztec+superlu+rol+frosch gotype=long_long", when="+sandybridge~epetra+optimization")

depends_on("trilinos-for-albany@develop", when="@develop")
depends_on("trilinos-for-albany@compass-2023-08-03", when="@compass-2023-08-03")

extends("python", when="+py")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ class TrilinosForAlbany(CMakePackage):

# ###################### Versions ##########################

version('compass-2023-08-03', sha256='b3d5c06eb31c22391923c6adf4b748672c81d8e4dc6118c421cb76a377512808',
url='https://github.com/E3SM-Project/Trilinos/archive/refs/tags/compass-2023-08-23.tar.gz')
version('xsdk-0.2.0', tag='xsdk-0.2.0')
version('develop', branch='develop')
version('master', branch='master')
Expand Down Expand Up @@ -330,6 +332,7 @@ class TrilinosForAlbany(CMakePackage):
depends_on('mpi')
depends_on('netcdf-c+mpi')
depends_on('parallel-netcdf', when="@12.12.1:+pnetcdf")
depends_on('parallel-netcdf', when="@compass-2023-08-03:+pnetcdf")
depends_on('parmetis', when='+metis')
depends_on('cgns', when='+cgns')
depends_on('adios2', when='+adios2')
Expand Down

0 comments on commit 82a2820

Please sign in to comment.