diff options
| author | kjrstory <kjrstory@gmail.com> | 2024-10-03 02:47:12 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-02 11:47:12 -0600 |
| commit | 787863e17606fa753498eeb9392b3cf23835fc5e (patch) | |
| tree | 3e97e8f0546b2088fec1a34b05ac5d1d37a5814e | |
| parent | 1da7d3bfe3380030586c3eaab02853c4988dea83 (diff) | |
| download | spack-787863e17606fa753498eeb9392b3cf23835fc5e.tar.gz spack-787863e17606fa753498eeb9392b3cf23835fc5e.tar.bz2 spack-787863e17606fa753498eeb9392b3cf23835fc5e.tar.xz spack-787863e17606fa753498eeb9392b3cf23835fc5e.zip | |
fds: add 6.9.0,6.9.1 and openmp (#46717)
* fds: add 6.9.0,6.9.1 and openmp
* typo and style fix
| -rw-r--r-- | var/spack/repos/builtin/packages/fds/package.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/fds/package.py b/var/spack/repos/builtin/packages/fds/package.py index e4707f9207..3143eddde0 100644 --- a/var/spack/repos/builtin/packages/fds/package.py +++ b/var/spack/repos/builtin/packages/fds/package.py @@ -21,8 +21,14 @@ class Fds(MakefilePackage): url = "https://github.com/firemodels/fds/archive/refs/tags/FDS-6.8.0.tar.gz" git = "https://github.com/firemodels/fds.git" + version("6.9.1", commit="889da6ae08d08dae680f7c0d8de66a3ad1c65375") + version("6.9.0", commit="63395692607884566fdedb5db4b5b4d98d3bcafb") version("6.8.0", commit="886e0096535519b7358a3c4393c91da3caee5072") + variant("openmp", default=False, description="Enable OpenMP support") + + conflicts("%gcc", when="+openmp", msg="GCC already provides OpenMP support") + depends_on("fortran", type="build") # generated depends_on("mpi") @@ -86,11 +92,12 @@ class Fds(MakefilePackage): mpi_prefix = mpi_mapping[spec["mpi"].name] compiler_prefix = compiler_mapping[spec.compiler.name] platform_prefix = platform_mapping[spec.architecture.platform] - return ["{}_{}_{}".format(mpi_prefix, compiler_prefix, platform_prefix)] + openmp_prefix = "_openmp" if "+openmp" in spec else "" + return [f"{mpi_prefix}_{compiler_prefix}_{platform_prefix}{openmp_prefix}"] def install(self, spec, prefix): mkdirp(prefix.bin) with working_dir(self.build_directory): install("*.mod", prefix.bin) install("*.o", prefix.bin) - install("fds_" + self.build_targets[0], prefix.bin + "/fds") + install("fds_" + self.build_targets[0], join_path(prefix.bin, "fds")) |