From a31d5122aa829cbde2f887dd898ab2275c00b5c0 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Fri, 29 Sep 2023 21:42:12 +0200 Subject: [PATCH 1/2] Add compass-2023-08-03 tags to albany and trilinos --- var/spack/repos/builtin/packages/albany/package.py | 2 ++ var/spack/repos/builtin/packages/trilinos-for-albany/package.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/var/spack/repos/builtin/packages/albany/package.py b/var/spack/repos/builtin/packages/albany/package.py index 8e6886a2428fae..d229178acf9798 100644 --- a/var/spack/repos/builtin/packages/albany/package.py +++ b/var/spack/repos/builtin/packages/albany/package.py @@ -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, @@ -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") diff --git a/var/spack/repos/builtin/packages/trilinos-for-albany/package.py b/var/spack/repos/builtin/packages/trilinos-for-albany/package.py index dc49ec1a3d72f9..ae21114367a5f1 100644 --- a/var/spack/repos/builtin/packages/trilinos-for-albany/package.py +++ b/var/spack/repos/builtin/packages/trilinos-for-albany/package.py @@ -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') From 7c87f90519b6acd56d6111b151e1d7d2d49fe31c Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Fri, 29 Sep 2023 11:26:28 +0200 Subject: [PATCH 2/2] Fix parallel-netcdf in trilinos-for-albany --- var/spack/repos/builtin/packages/trilinos-for-albany/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/trilinos-for-albany/package.py b/var/spack/repos/builtin/packages/trilinos-for-albany/package.py index ae21114367a5f1..c24b203090b723 100644 --- a/var/spack/repos/builtin/packages/trilinos-for-albany/package.py +++ b/var/spack/repos/builtin/packages/trilinos-for-albany/package.py @@ -332,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')