Skip to content

Commit

Permalink
Add compass-2023-08-03 tags to albany and trilinos
Browse files Browse the repository at this point in the history
  • Loading branch information
xylar committed Sep 29, 2023
1 parent 6eeac13 commit 046c3ee
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
11 changes: 6 additions & 5 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-albany-2023-08-03')
version("develop", branch="master")

variant("debug", default=False,
Expand Down Expand Up @@ -64,7 +65,7 @@ class Albany(CMakePackage):

depends_on("trilinos-for-albany@develop~superlu-dist+exodus+chaco+isorropia+tempus+rythmos+teko+intrepid+intrepid2+minitensor+phalanx+pnetcdf+nox+piro+shards+stk+amesos2~hypre+ifpack2~mumps~suite-sparse+ml+superlu+rol+frosch gotype=long_long", when="~sandybridge+epetra+optimization")
depends_on("trilinos-for-albany@develop~superlu-dist+exodus+chaco+isorropia+tempus+rythmos+teko+intrepid+intrepid2+minitensor+phalanx+pnetcdf+nox+piro+shards+stk+amesos2~hypre+ifpack2~mumps~suite-sparse+sandybridge+ml+superlu+rol+frosch gotype=long_long", when="+sandybridge+epetra+optimization")

depends_on("trilinos-for-albany@develop~superlu-dist+exodus+chaco+isorropia+tempus+rythmos+teko+intrepid+intrepid2+minitensor+phalanx+pnetcdf+nox+piro+shards+stk+amesos2~hypre+ifpack2~mumps~suite-sparse+ml+rol gotype=long_long", when="~sandybridge+epetra~optimization+py")
depends_on("trilinos-for-albany@develop~superlu-dist+exodus+chaco+isorropia+tempus+rythmos+teko+intrepid+intrepid2+minitensor+phalanx+pnetcdf+nox+piro+shards+stk+amesos2~hypre+ifpack2~mumps~suite-sparse+sandybridge+ml+rol gotype=long_long", when="+sandybridge+epetra~optimization+py")

Expand All @@ -81,9 +82,9 @@ class Albany(CMakePackage):
depends_on("py-mpi4py", when="+py")
depends_on("py-scipy", when="+py")

#IKT, 2/27/2022: comment the above lines and uncomment the followint to use trilinos, instead of
#trilinos-for-albany. The code should build but will not run (there are seg faults at the end of
#each test that is run, after time monitor output).
#IKT, 2/27/2022: comment the above lines and uncomment the followint to use trilinos, instead of
#trilinos-for-albany. The code should build but will not run (there are seg faults at the end of
#each test that is run, after time monitor output).
#depends_on("trilinos~superlu-dist+exodus+chaco+isorropia+tempus+rythmos+teko+intrepid+intrepid2+minitensor+phalanx+nox+piro+shards+stk+amesos2~hypre+ifpack2~mumps~suite-sparse+panzer gotype=long_long")
def cmake_args(self):
spec = self.spec
Expand Down Expand Up @@ -124,7 +125,7 @@ def cmake_args(self):
options.extend([
"-DALBANY_SFAD_SIZE=%d" % int(spec.variants["sfadsize"].value)
])
if "+debug" in spec:
if "+debug" in spec:
options.extend([
"-DCMAKE_BUILD_TYPE:STRING=DEBUG"
])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class TrilinosForAlbany(CMakePackage):

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

version('compass-2023-08-03', tag='compass-trilinos-2023-08-03')
version('xsdk-0.2.0', tag='xsdk-0.2.0')
version('develop', branch='develop')
version('master', branch='master')
Expand Down

0 comments on commit 046c3ee

Please sign in to comment.