From a1bff464352e1a790880931d5b1173657adfca26 Mon Sep 17 00:00:00 2001 From: "Marc T. Henry de Frahan" Date: Thu, 13 Feb 2025 19:28:11 -0700 Subject: [PATCH] Update openfast, amr-wind, and nalu-wind packages (#48994) --- var/spack/repos/builtin/packages/amr-wind/package.py | 4 ++++ var/spack/repos/builtin/packages/nalu-wind/package.py | 7 +++++-- var/spack/repos/builtin/packages/openfast/package.py | 6 +++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/amr-wind/package.py b/var/spack/repos/builtin/packages/amr-wind/package.py index fbb66f6435e..c1af337c74a 100644 --- a/var/spack/repos/builtin/packages/amr-wind/package.py +++ b/var/spack/repos/builtin/packages/amr-wind/package.py @@ -20,6 +20,7 @@ class AmrWind(CMakePackage, CudaPackage, ROCmPackage): license("BSD-3-Clause") version("main", branch="main", submodules=True) + version("3.4.0", tag="v3.4.0", submodules=True) version("3.3.1", tag="v3.3.1", submodules=True) version("3.3.0", tag="v3.3.0", submodules=True) version("3.2.3", tag="v3.2.3", submodules=True) @@ -121,6 +122,9 @@ class AmrWind(CMakePackage, CudaPackage, ROCmPackage): conflicts("+openmp", when="+cuda") conflicts("+shared", when="+cuda") conflicts("@:2.0", when="+waves2amr") + conflicts( + "openfast@4.0.0:4.0.1", msg="OpenFAST 4.0.0:4.0.1 contains a bug. Use OpenFAST >= 4.0.2." + ) def setup_build_environment(self, env): # Avoid compile errors with Intel interprocedural optimization diff --git a/var/spack/repos/builtin/packages/nalu-wind/package.py b/var/spack/repos/builtin/packages/nalu-wind/package.py index b9a4a04750e..bc428851dae 100644 --- a/var/spack/repos/builtin/packages/nalu-wind/package.py +++ b/var/spack/repos/builtin/packages/nalu-wind/package.py @@ -62,7 +62,8 @@ class NaluWind(CMakePackage, CudaPackage, ROCmPackage): depends_on("mpi") depends_on("yaml-cpp@0.6.0:0.7.0") - depends_on("openfast@4.0.0:+cxx+netcdf", when="+fsi") + depends_on("openfast@4.0.2:+cxx+netcdf", when="+fsi") + depends_on("openfast@4.0.2:+cxx+netcdf", when="+openfast") depends_on("trilinos@15.1.1", when="@=2.1.0") depends_on("trilinos@13.4.1", when="@=2.0.0") depends_on("hypre@2.29.0:", when="@2.0.0:+hypre") @@ -71,7 +72,6 @@ class NaluWind(CMakePackage, CudaPackage, ROCmPackage): "gotype=long cxxstd=17" ) depends_on("trilinos~cuda~wrapper", when="~cuda") - depends_on("openfast@2.6.0: +cxx", when="+openfast") depends_on("tioga@1.0.0:", when="+tioga") depends_on("hypre@2.18.2: ~int64+mpi~superlu-dist", when="+hypre") depends_on("trilinos+muelu+belos+amesos2+ifpack2", when="+trilinos-solvers") @@ -127,6 +127,9 @@ class NaluWind(CMakePackage, CudaPackage, ROCmPackage): conflicts("^trilinos+cuda", when="~cuda") conflicts("^trilinos+rocm", when="~rocm") conflicts("+shared", when="+trilinos-solvers") + conflicts( + "openfast@4.0.0:4.0.1", msg="OpenFAST 4.0.0:4.0.1 contains a bug. Use OpenFAST >= 4.0.2." + ) def setup_dependent_run_environment(self, env, dependent_spec): spec = self.spec diff --git a/var/spack/repos/builtin/packages/openfast/package.py b/var/spack/repos/builtin/packages/openfast/package.py index 5feb3ea11e3..ab097acdd88 100644 --- a/var/spack/repos/builtin/packages/openfast/package.py +++ b/var/spack/repos/builtin/packages/openfast/package.py @@ -17,7 +17,7 @@ class Openfast(CMakePackage): version("develop", branch="dev") version("master", branch="main") - version("4.0.0", tag="v4.0.0") + version("4.0.2", tag="v4.0.2") version("3.5.5", tag="v3.5.5") version("3.5.4", tag="v3.5.4") version("3.5.3", tag="v3.5.3") @@ -37,6 +37,10 @@ class Openfast(CMakePackage): version("2.0.0", tag="v2.0.0") version("1.0.0", tag="v1.0.0") + with default_args(deprecated=True): + version("4.0.1", tag="v4.0.1") + version("4.0.0", tag="v4.0.0") + depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated depends_on("fortran", type="build") # generated