From 7f3dd38ccc106142846f29f76b928fa58e0e3164 Mon Sep 17 00:00:00 2001 From: Michael B Kuhn <31661049+mbkuhn@users.noreply.github.com> Date: Mon, 13 May 2024 14:21:25 -0600 Subject: [PATCH] amr-wind: add latest versions and correct waves2amr details (#44099) * add latest versions and correct waves2amr details * update commit associated with v2.1.0 --- var/spack/repos/builtin/packages/amr-wind/package.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/amr-wind/package.py b/var/spack/repos/builtin/packages/amr-wind/package.py index 19fbf7ffd97896..807d917cec81e5 100644 --- a/var/spack/repos/builtin/packages/amr-wind/package.py +++ b/var/spack/repos/builtin/packages/amr-wind/package.py @@ -21,6 +21,12 @@ class AmrWind(CMakePackage, CudaPackage, ROCmPackage): license("BSD-3-Clause") version("main", branch="main", submodules=True) + version( + "2.1.0", tag="v2.1.0", commit="bc787f21deca9239928182e27400133934c62658", submodules=True + ) + version( + "2.0.0", tag="v2.0.0", commit="ea448365033fc6bc9ee0febeb369b377f4fd8240", submodules=True + ) version( "1.4.0", tag="v1.4.0", commit="bdddf133e41a9b7b4c8ce28f1ea1bebec47678f5", submodules=True ) @@ -91,7 +97,7 @@ class AmrWind(CMakePackage, CudaPackage, ROCmPackage): depends_on("openfast@3.5:", when="@2: +openfast") depends_on("helics@:3.3.2", when="+helics") depends_on("helics@:3.3.2+mpi", when="+helics+mpi") - depends_on("fftw", when="@2: +waves2amr") + depends_on("fftw", when="@2.1: +waves2amr") for arch in CudaPackage.cuda_arch_values: depends_on("hypre+cuda cuda_arch=%s" % arch, when="+cuda+hypre cuda_arch=%s" % arch) @@ -104,7 +110,7 @@ class AmrWind(CMakePackage, CudaPackage, ROCmPackage): conflicts("+openmp", when="+cuda") conflicts("+shared", when="+cuda") - conflicts("@:1.4.0", when="+waves2amr") + conflicts("@:2.0", when="+waves2amr") def setup_build_environment(self, env): # Avoid compile errors with Intel interprocedural optimization