diff options
16 files changed, 25 insertions, 30 deletions
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index d2bd57aeb4..e5896f040e 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -37,7 +37,6 @@ packages: mpi: [openmpi, mpich] mysql-client: [mysql, mariadb-c-client] opencl: [pocl] - openfoam: [openfoam-com, openfoam-org, foam-extend] pil: [py-pillow] pkgconfig: [pkgconf, pkg-config] scalapack: [netlib-scalapack] diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py index 6fa59decda..0d29dc13ee 100644 --- a/var/spack/repos/builtin/packages/foam-extend/package.py +++ b/var/spack/repos/builtin/packages/foam-extend/package.py @@ -24,7 +24,7 @@ # Changes # 2017-03-28 Mark Olesen <mark.olesen@esi-group.com> # - avoid installing intermediate targets. -# - reworked to mirror the openfoam-com package. +# - reworked to mirror the openfoam package. # If changes are needed here, consider if they need applying there too. # # Known issues @@ -37,10 +37,10 @@ import os from spack import * from spack.util.environment import EnvironmentModifications -from spack.pkg.builtin.openfoam_com import OpenfoamArch -from spack.pkg.builtin.openfoam_com import add_extra_files -from spack.pkg.builtin.openfoam_com import write_environ -from spack.pkg.builtin.openfoam_com import rewrite_environ_files +from spack.pkg.builtin.openfoam import OpenfoamArch +from spack.pkg.builtin.openfoam import add_extra_files +from spack.pkg.builtin.openfoam import write_environ +from spack.pkg.builtin.openfoam import rewrite_environ_files import llnl.util.tty as tty @@ -78,7 +78,6 @@ class FoamExtend(Package): variant('source', default=True, description='Install library/application sources and tutorials') - provides('openfoam') depends_on('mpi') depends_on('python') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/of-adios-write/package.py b/var/spack/repos/builtin/packages/of-adios-write/package.py index f2265cc974..e88a25b7b2 100644 --- a/var/spack/repos/builtin/packages/of-adios-write/package.py +++ b/var/spack/repos/builtin/packages/of-adios-write/package.py @@ -20,7 +20,7 @@ import os import llnl.util.tty as tty from spack import * -from spack.pkg.builtin.openfoam_com import add_extra_files +from spack.pkg.builtin.openfoam import add_extra_files class OfAdiosWrite(Package): @@ -44,9 +44,9 @@ class OfAdiosWrite(Package): variant('source', default=True, description='Install library source') - depends_on('openfoam-com@develop+source', when='@develop') - depends_on('openfoam-com@1706+source', when='@1706') - depends_on('openfoam-com@1612+source', when='@1612') + depends_on('openfoam@develop+source', when='@develop') + depends_on('openfoam@1706+source', when='@1706') + depends_on('openfoam@1612+source', when='@1612') depends_on('adios') # General patches diff --git a/var/spack/repos/builtin/packages/of-catalyst/package.py b/var/spack/repos/builtin/packages/of-catalyst/package.py index 4eea85e8b1..9dfc56d9d5 100644 --- a/var/spack/repos/builtin/packages/of-catalyst/package.py +++ b/var/spack/repos/builtin/packages/of-catalyst/package.py @@ -30,8 +30,8 @@ class OfCatalyst(CMakePackage): variant('full', default=False, description='Build against paraview (full) or catalyst (light)') - depends_on('openfoam-com@1806', when='@1806', type=('build', 'link', 'run')) - depends_on('openfoam-com@develop', when='@develop', type=('build', 'link', 'run')) + depends_on('openfoam@1806', when='@1806', type=('build', 'link', 'run')) + depends_on('openfoam@develop', when='@develop', type=('build', 'link', 'run')) depends_on('catalyst@5.5:', when='~full') depends_on('paraview@5.5:+osmesa~qt', when='+full') diff --git a/var/spack/repos/builtin/packages/of-precice/package.py b/var/spack/repos/builtin/packages/of-precice/package.py index 82e486dbfc..1b833da812 100644 --- a/var/spack/repos/builtin/packages/of-precice/package.py +++ b/var/spack/repos/builtin/packages/of-precice/package.py @@ -8,7 +8,7 @@ import os import llnl.util.tty as tty from spack import * -from spack.pkg.builtin.openfoam_com import add_extra_files +from spack.pkg.builtin.openfoam import add_extra_files class OfPrecice(Package): diff --git a/var/spack/repos/builtin/packages/openfoam-com/common/README b/var/spack/repos/builtin/packages/openfoam-com/common/README deleted file mode 100644 index d116bbaa23..0000000000 --- a/var/spack/repos/builtin/packages/openfoam-com/common/README +++ /dev/null @@ -1,2 +0,0 @@ -Some helper tools for packaging applications/libraries dependent on an -openfoam provider. diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index 4b017096cc..7f26bd87d9 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -17,7 +17,7 @@ ############################################################################## # # Notes -# - The openfoam-org package is a modified version of the openfoam-com package. +# - The openfoam-org package is a modified version of the openfoam package. # If changes are needed here, consider if they should also be applied there. # # - Building with boost/cgal is not included, since some of the logic is not @@ -40,11 +40,11 @@ import os import llnl.util.tty as tty from spack import * -from spack.pkg.builtin.openfoam_com import add_extra_files -from spack.pkg.builtin.openfoam_com import write_environ -from spack.pkg.builtin.openfoam_com import rewrite_environ_files -from spack.pkg.builtin.openfoam_com import mplib_content -from spack.pkg.builtin.openfoam_com import OpenfoamArch +from spack.pkg.builtin.openfoam import add_extra_files +from spack.pkg.builtin.openfoam import write_environ +from spack.pkg.builtin.openfoam import rewrite_environ_files +from spack.pkg.builtin.openfoam import mplib_content +from spack.pkg.builtin.openfoam import OpenfoamArch class OpenfoamOrg(Package): @@ -76,7 +76,6 @@ class OpenfoamOrg(Package): variant('source', default=True, description='Install library/application sources and tutorials') - provides('openfoam') depends_on('mpi') depends_on('zlib') depends_on('flex', type='build') @@ -128,7 +127,7 @@ class OpenfoamOrg(Package): return settings def setup_environment(self, spack_env, run_env): - # This should be similar to the openfoam-com package, + # This should be similar to the openfoam package, # but sourcing the etc/bashrc here seems to exit with an error. # ... this needs to be examined in more detail. # diff --git a/var/spack/repos/builtin/packages/openfoam-com/1612-spack-patches.patch b/var/spack/repos/builtin/packages/openfoam/1612-spack-patches.patch index 00679c4c1d..00679c4c1d 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/1612-spack-patches.patch +++ b/var/spack/repos/builtin/packages/openfoam/1612-spack-patches.patch diff --git a/var/spack/repos/builtin/packages/openfoam-com/1806-have-kahip.patch b/var/spack/repos/builtin/packages/openfoam/1806-have-kahip.patch index 3e10a44145..3e10a44145 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/1806-have-kahip.patch +++ b/var/spack/repos/builtin/packages/openfoam/1806-have-kahip.patch diff --git a/var/spack/repos/builtin/packages/openfoam/common/README b/var/spack/repos/builtin/packages/openfoam/common/README new file mode 100644 index 0000000000..c4ba87b5cc --- /dev/null +++ b/var/spack/repos/builtin/packages/openfoam/common/README @@ -0,0 +1 @@ +Helper tools for packaging applications/libraries dependent on OpenFOAM. diff --git a/var/spack/repos/builtin/packages/openfoam-com/common/README-spack b/var/spack/repos/builtin/packages/openfoam/common/README-spack index 83b606dda1..83b606dda1 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/common/README-spack +++ b/var/spack/repos/builtin/packages/openfoam/common/README-spack diff --git a/var/spack/repos/builtin/packages/openfoam-com/common/change-sitedir.sh b/var/spack/repos/builtin/packages/openfoam/common/change-sitedir.sh index 61d9c3ea8b..61d9c3ea8b 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/common/change-sitedir.sh +++ b/var/spack/repos/builtin/packages/openfoam/common/change-sitedir.sh diff --git a/var/spack/repos/builtin/packages/openfoam-com/common/change-userdir.sh b/var/spack/repos/builtin/packages/openfoam/common/change-userdir.sh index d126fcfe5d..d126fcfe5d 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/common/change-userdir.sh +++ b/var/spack/repos/builtin/packages/openfoam/common/change-userdir.sh diff --git a/var/spack/repos/builtin/packages/openfoam-com/common/spack-Allwmake b/var/spack/repos/builtin/packages/openfoam/common/spack-Allwmake index eb2d097c4e..a98d7d0db2 100755 --- a/var/spack/repos/builtin/packages/openfoam-com/common/spack-Allwmake +++ b/var/spack/repos/builtin/packages/openfoam/common/spack-Allwmake @@ -4,7 +4,7 @@ export FOAM_INST_DIR=$(cd .. && pwd -L) . $PWD/etc/bashrc '' # No arguments mkdir -p $FOAM_APPBIN $FOAM_LIBBIN 2>/dev/null # Allow interrupt echo "Build openfoam with SPACK ($@)" -echo WM_PROJECT_DIR = $WM_PROJECT_DIR +echo "WM_PROJECT_DIR = $WM_PROJECT_DIR" # Prefer spack-specific Allwmake if it exists if [ -f Allwmake-spack ] diff --git a/var/spack/repos/builtin/packages/openfoam-com/common/spack-derived-Allwmake b/var/spack/repos/builtin/packages/openfoam/common/spack-derived-Allwmake index 02741f1d13..02741f1d13 100755 --- a/var/spack/repos/builtin/packages/openfoam-com/common/spack-derived-Allwmake +++ b/var/spack/repos/builtin/packages/openfoam/common/spack-derived-Allwmake diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam/package.py index 318b2cb5b1..4cf12a19b1 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam/package.py @@ -37,7 +37,7 @@ # - Combining +zoltan with +int64 has not been tested, but probably won't work. # - Combining +mgridgen with +int64 or +float32 probably won't work. # -# The spack 'develop' version of openfoam-com retains the upstream +# The spack 'develop' version of openfoam retains the upstream # WM_PROJECT_VERSION=plus naming internally. # ############################################################################## @@ -64,7 +64,7 @@ __all__ = [ def add_extra_files(foam_pkg, common, local, **kwargs): """Copy additional common and local files into the stage.source_path - from the openfoam-com/common and the package/assets directories, + from the openfoam/common and the package/assets directories, respectively """ outdir = foam_pkg.stage.source_path @@ -247,7 +247,7 @@ def mplib_content(spec, pre=None): # ----------------------------------------------------------------------------- -class OpenfoamCom(Package): +class Openfoam(Package): """OpenFOAM is a GPL-opensource C++ CFD-toolbox. This offering is supported by OpenCFD Ltd, producer and distributor of the OpenFOAM software via www.openfoam.com, @@ -263,7 +263,7 @@ class OpenfoamCom(Package): list_url = "https://sourceforge.net/projects/openfoamplus/files/" list_depth = 2 - version('develop', branch='develop', submodules='True') # Needs credentials + version('develop', branch='develop', submodules='True') version('1906', 'ab7017e262c0c0fceec55c31e2153180') version('1812_190531', 'a4b416838a8a76fdec22706a33c96de3') version('1812', '6a315687b3601eeece7ff7c7aed3d9a5') @@ -296,7 +296,6 @@ class OpenfoamCom(Package): variant('source', default=True, description='Install library/application sources and tutorials') - provides('openfoam') depends_on('mpi') # After 1712, could suggest openmpi+thread_multiple for collated output |