diff options
| author | Mark Olesen <Mark.Olesen@esi-group.com> | 2019-10-01 17:48:14 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-10-01 10:48:14 -0500 |
| commit | f9396978638847da572b4121456a69ab86ac5d45 (patch) | |
| tree | 1efb8fcda6d549ae228d6d890d66fb42f106a269 | |
| parent | 5b4040ea3638eee23298dabd1b821cc0451f8280 (diff) | |
| download | spack-f9396978638847da572b4121456a69ab86ac5d45.tar.gz spack-f9396978638847da572b4121456a69ab86ac5d45.tar.bz2 spack-f9396978638847da572b4121456a69ab86ac5d45.tar.xz spack-f9396978638847da572b4121456a69ab86ac5d45.zip | |
add adios2 dependency and configuration for newest OpenFOAM (#12993)
| -rw-r--r-- | var/spack/repos/builtin/packages/openfoam/package.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/openfoam/package.py b/var/spack/repos/builtin/packages/openfoam/package.py index 2a1bdb6e0e..60b49bbca8 100644 --- a/var/spack/repos/builtin/packages/openfoam/package.py +++ b/var/spack/repos/builtin/packages/openfoam/package.py @@ -286,8 +286,6 @@ class Openfoam(Package): description='With scotch/ptscotch decomposition') variant('zoltan', default=False, description='With zoltan renumbering') - # TODO?# variant('scalasca', default=False, - # TODO?# description='With scalasca profiling') variant('mgridgen', default=False, description='With mgridgen support') variant('paraview', default=False, description='Build paraview plugins and runtime post-processing') @@ -321,8 +319,7 @@ class Openfoam(Package): depends_on('parmgridgen', when='+mgridgen', type='build') depends_on('zoltan', when='+zoltan') depends_on('vtk', when='+vtk') - - # TODO?# depends_on('scalasca', when='+scalasca') + depends_on('adios2', when='@1912:') # For OpenFOAM plugins and run-time post-processing this should just be # 'paraview+plugins' but that resolves poorly. @@ -555,6 +552,7 @@ class Openfoam(Package): ('LD_LIBRARY_PATH', foam_add_lib(user_mpi['libdir'])), ('PATH', foam_add_path(user_mpi['bindir'])), ], + 'adios2': {}, 'scotch': {}, 'kahip': {}, 'metis': {}, @@ -564,6 +562,15 @@ class Openfoam(Package): 'vtk': [], } + # With adios2 after 1912 or develop (after 2019-10-01) + if spec.satisfies('@1912:'): + self.etc_config['adios2'] = [ + ('ADIOS2_ARCH_PATH', spec['adios2'].prefix), + ('LD_LIBRARY_PATH', + foam_add_lib(pkglib(spec['adios2'], '${ADIOS2_ARCH_PATH}'))), + ('PATH', foam_add_path('${ADIOS2_ARCH_PATH}/bin')), + ] + if '+scotch' in spec: self.etc_config['scotch'] = { 'SCOTCH_ARCH_PATH': spec['scotch'].prefix, |